From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755396AbdJIUt6 (ORCPT ); Mon, 9 Oct 2017 16:49:58 -0400 Received: from mout.web.de ([212.227.17.12]:57473 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754188AbdJIUt4 (ORCPT ); Mon, 9 Oct 2017 16:49:56 -0400 Subject: [PATCH 1/3] net/atm: Delete an error message for a failed memory allocation in five functions From: SF Markus Elfring To: netdev@vger.kernel.org, Alexey Dobriyan , Andrew Morton , Augusto Mecking Caringi , Bhumika Goyal , "David S. Miller" , David Windsor , Elena Reshetova , Hans Liljestrand , Jarod Wilson , Johannes Berg , Kees Cook , Mitchell Blank Jr , Roopa Prabhu Cc: LKML , kernel-janitors@vger.kernel.org References: <10a92558-1105-b947-86a2-6ac763cca36d@users.sourceforge.net> Message-ID: <5270f15b-5e97-0c3e-3e55-fbded48ae07d@users.sourceforge.net> Date: Mon, 9 Oct 2017 22:49:33 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <10a92558-1105-b947-86a2-6ac763cca36d@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:/UOMoywmEtE026gwLOCoD3IDzMWcGn5FCaGjiUeU74e92J5Ve+Q 843rduzOiKlDDix/ikZV/Eh17r9JvzSgRQCyMEA2yLU0DhUZNNykPp4qQ5F59owDbtoXamB R4K5VRe0qlFxobVxOd6ztUCqk7JZtdk9x/a4OQw7LbKsP22Jy0hJssZx386HJSUxhYNeTrc 1pHtNU9oj9p2CoHkcwKiA== X-UI-Out-Filterresults: notjunk:1;V01:K0:7phiGjOCweQ=:oSjgLTIc4VqflCzyn08vUC 7QhGk6sDoDb6lWVAmHj+r3+CUsjJSLnz6QT6TuxBSYE5AXPstSPwBdktsEGSX1U2DKOXakv9S X8M1fBvDvDkYEqTmruNBG1c6X5rfaRF7K7aT+P1oFl1xGLlx1w/KCggTo6n4JI+LnRo10/TCc aiUe+/HfVFzHVH/GJjd+jy8qVnVxWgQhR+9G3wVdbDaQJzJdSGFg87JGq9QWh4aj00sYrchPt /Tk7HqiugmTzSuegRAcUGQed+kfVXo1J1n1a8JmxKPDLjjnpCqn+n3A++yTXz+1SZTG0bFtfy JOFyxTQ/ubbgQO6tMIVtEQV8QUumHPPDgY9edEAwQlvFRKOU40fqEz9Xd0HGZzxmnfpNZ9OZK jFOiGsJX/KkKxpihQT9PJFimnT4OmoyhPF6cRnRHqHkdRizBYev/kuJpmoDLtCXhNyMKE9XxJ L3qdPaMrJsfJnBaHhBOsp+ZpWRjQwx52nWZRWxXrBy3BbqTw1y7vjGJWILc1TEfr0RaBBE4yj YpXkyKl8pJNYeFfLrrgMjEi3VIbBmO/eyZjnZhbuYWo4xTl5znDPUg4QnEpD4jOwoL0zT+9GX hoqwQAQRHd9/YypO0bNxpXao4rEsygJyWWO+BKXrTbq7o+tfJDFHkvG95xG9Pg2TSqJV9dUTO ytNH32Dq98fRukmtR4xes/H2pMhe0rNhM4tprt/+Ur+urHf3LVfKSyLY6KRDfE9+fqiKp43+m Nb/4osMHdUjCvY0IABWEdMYQXx7dXRdpWl8yMY1EPnYCLTn4/z05ckTDQYv4ccdLrj0wZLGUF DRxGGtMiTV4vVlryd0Fni842XIYdqXu8i7pUCSLnCSBaTu5iP0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 9 Oct 2017 21:34:35 +0200 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- net/atm/lec.c | 5 ++--- net/atm/mpc.c | 8 ++------ net/atm/mpoa_caches.c | 8 ++------ 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/net/atm/lec.c b/net/atm/lec.c index a3d93a1bb133..f5be0b931978 100644 --- a/net/atm/lec.c +++ b/net/atm/lec.c @@ -1553,10 +1553,9 @@ static struct lec_arp_table *make_entry(struct lec_priv *priv, struct lec_arp_table *to_return; to_return = kzalloc(sizeof(struct lec_arp_table), GFP_ATOMIC); - if (!to_return) { - pr_info("LEC: Arp entry kmalloc failed\n"); + if (!to_return) return NULL; - } + ether_addr_copy(to_return->mac_addr, mac_addr); INIT_HLIST_NODE(&to_return->next); setup_timer(&to_return->timer, lec_arp_expire_arp, diff --git a/net/atm/mpc.c b/net/atm/mpc.c index 5677147209e8..dd57d05b5dcc 100644 --- a/net/atm/mpc.c +++ b/net/atm/mpc.c @@ -184,10 +184,8 @@ struct atm_mpoa_qos *atm_mpoa_add_qos(__be32 dst_ip, struct atm_qos *qos) } entry = kmalloc(sizeof(struct atm_mpoa_qos), GFP_KERNEL); - if (entry == NULL) { - pr_info("mpoa: out of memory\n"); + if (!entry) return entry; - } entry->ipaddr = dst_ip; entry->qos = *qos; @@ -473,10 +471,8 @@ static const uint8_t *copy_macs(struct mpoa_client *mpc, kfree(mpc->mps_macs); mpc->number_of_mps_macs = 0; mpc->mps_macs = kmalloc(num_macs * ETH_ALEN, GFP_KERNEL); - if (mpc->mps_macs == NULL) { - pr_info("(%s) out of mem\n", mpc->dev->name); + if (!mpc->mps_macs) return NULL; - } } ether_addr_copy(mpc->mps_macs, router_mac); tlvs += 20; if (device_type == MPS_AND_MPC) tlvs += 20; diff --git a/net/atm/mpoa_caches.c b/net/atm/mpoa_caches.c index 4ccaa16b1eb1..7495b42d59eb 100644 --- a/net/atm/mpoa_caches.c +++ b/net/atm/mpoa_caches.c @@ -98,10 +98,8 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip, { in_cache_entry *entry = kzalloc(sizeof(in_cache_entry), GFP_KERNEL); - if (entry == NULL) { - pr_info("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n"); + if (!entry) return NULL; - } dprintk("adding an ingress entry, ip = %pI4\n", &dst_ip); @@ -460,10 +458,8 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, { eg_cache_entry *entry = kzalloc(sizeof(eg_cache_entry), GFP_KERNEL); - if (entry == NULL) { - pr_info("out of memory\n"); + if (!entry) return NULL; - } dprintk("adding an egress entry, ip = %pI4, this should be our IP\n", &msg->content.eg_info.eg_dst_ip); -- 2.14.2