From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Thu, 12 Oct 2017 10:40:43 +0000 Subject: [PATCH 02/10] staging: irda: Delete ten error messages for a failed memory allocation Message-Id: <7ce22c79-4b72-0e81-e5dd-fcaead712fc4@users.sourceforge.net> List-Id: References: <8152401b-d68d-c4fe-2619-82a09e0c52ec@users.sourceforge.net> In-Reply-To: <8152401b-d68d-c4fe-2619-82a09e0c52ec@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: devel@driverdev.osuosl.org, netdev@vger.kernel.org, Al Viro , Corentin Labbe , David Howells , "David S. Miller" , Georgiana Chelu , Greg Kroah-Hartman , Johannes Berg , Julia Lawall , Samuel Ortiz , Srishti Sharma , Stephen Hemminger , Yuan Linyu Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Tue, 10 Oct 2017 21:10:43 +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 --- drivers/staging/irda/net/irias_object.c | 24 ++++-------------------- drivers/staging/irda/net/irlap_frame.c | 4 +--- drivers/staging/irda/net/irlmp.c | 1 - drivers/staging/irda/net/irttp.c | 1 - 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/drivers/staging/irda/net/irias_object.c b/drivers/staging/irda/net/irias_object.c index 1064fac2fd36..4db986b9d756 100644 --- a/drivers/staging/irda/net/irias_object.c +++ b/drivers/staging/irda/net/irias_object.c @@ -49,17 +49,12 @@ struct ias_object *irias_new_object( char *name, int id) struct ias_object *obj; obj = kzalloc(sizeof(*obj), GFP_ATOMIC); - if (obj = NULL) { - net_warn_ratelimited("%s(), Unable to allocate object!\n", - __func__); + if (!obj) return NULL; - } obj->magic = IAS_OBJECT_MAGIC; obj->name = kstrndup(name, IAS_MAX_CLASSNAME, GFP_ATOMIC); if (!obj->name) { - net_warn_ratelimited("%s(), Unable to allocate name!\n", - __func__); kfree(obj); return NULL; } @@ -319,11 +314,8 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value, IRDA_ASSERT(name != NULL, return;); attrib = kzalloc(sizeof(*attrib), GFP_ATOMIC); - if (attrib = NULL) { - net_warn_ratelimited("%s: Unable to allocate attribute!\n", - __func__); + if (!attrib) return; - } attrib->magic = IAS_ATTRIB_MAGIC; attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC); @@ -363,11 +355,8 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets, IRDA_ASSERT(octets != NULL, return;); attrib = kzalloc(sizeof(*attrib), GFP_ATOMIC); - if (attrib = NULL) { - net_warn_ratelimited("%s: Unable to allocate attribute!\n", - __func__); + if (!attrib) return; - } attrib->magic = IAS_ATTRIB_MAGIC; attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC); @@ -405,11 +394,8 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value, IRDA_ASSERT(value != NULL, return;); attrib = kzalloc(sizeof(*attrib), GFP_ATOMIC); - if (attrib = NULL) { - net_warn_ratelimited("%s: Unable to allocate attribute!\n", - __func__); + if (!attrib) return; - } attrib->magic = IAS_ATTRIB_MAGIC; attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC); @@ -470,7 +456,6 @@ struct ias_value *irias_new_string_value(char *string) value->charset = CS_ASCII; value->t.string = kstrndup(string, IAS_MAX_STRING, GFP_ATOMIC); if (!value->t.string) { - net_warn_ratelimited("%s: Unable to kmalloc!\n", __func__); kfree(value); return NULL; } @@ -503,7 +488,6 @@ struct ias_value *irias_new_octseq_value(__u8 *octseq , int len) value->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC); if (value->t.oct_seq = NULL){ - net_warn_ratelimited("%s: Unable to kmalloc!\n", __func__); kfree(value); return NULL; } diff --git a/drivers/staging/irda/net/irlap_frame.c b/drivers/staging/irda/net/irlap_frame.c index 21891ef7ee33..d4d88a5d2976 100644 --- a/drivers/staging/irda/net/irlap_frame.c +++ b/drivers/staging/irda/net/irlap_frame.c @@ -433,10 +433,8 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self, } discovery = kzalloc(sizeof(*discovery), GFP_ATOMIC); - if (!discovery) { - net_warn_ratelimited("%s: kmalloc failed!\n", __func__); + if (!discovery) return; - } discovery->data.daddr = info->daddr; discovery->data.saddr = self->saddr; diff --git a/drivers/staging/irda/net/irlmp.c b/drivers/staging/irda/net/irlmp.c index 38772a3b9df8..f075735e4b9b 100644 --- a/drivers/staging/irda/net/irlmp.c +++ b/drivers/staging/irda/net/irlmp.c @@ -641,7 +641,6 @@ struct lsap_cb *irlmp_dup(struct lsap_cb *orig, void *instance) /* Allocate a new instance */ new = kmemdup(orig, sizeof(*new), GFP_ATOMIC); if (!new) { - pr_debug("%s(), unable to kmalloc\n", __func__); spin_unlock_irqrestore(&irlmp->unconnected_lsaps->hb_spinlock, flags); return NULL; diff --git a/drivers/staging/irda/net/irttp.c b/drivers/staging/irda/net/irttp.c index 958bfbe38bfb..bcab5a60cd47 100644 --- a/drivers/staging/irda/net/irttp.c +++ b/drivers/staging/irda/net/irttp.c @@ -1443,7 +1443,6 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance) /* Allocate a new instance */ new = kmemdup(orig, sizeof(*new), GFP_ATOMIC); if (!new) { - pr_debug("%s(), unable to kmalloc\n", __func__); spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags); return NULL; } -- 2.14.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756049AbdJLKlj (ORCPT ); Thu, 12 Oct 2017 06:41:39 -0400 Received: from mout.web.de ([212.227.15.14]:62588 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754162AbdJLKlh (ORCPT ); Thu, 12 Oct 2017 06:41:37 -0400 Subject: [PATCH 02/10] staging: irda: Delete ten error messages for a failed memory allocation From: SF Markus Elfring To: devel@driverdev.osuosl.org, netdev@vger.kernel.org, Al Viro , Corentin Labbe , David Howells , "David S. Miller" , Georgiana Chelu , Greg Kroah-Hartman , Johannes Berg , Julia Lawall , Samuel Ortiz , Srishti Sharma , Stephen Hemminger , Yuan Linyu Cc: LKML , kernel-janitors@vger.kernel.org References: <8152401b-d68d-c4fe-2619-82a09e0c52ec@users.sourceforge.net> Message-ID: <7ce22c79-4b72-0e81-e5dd-fcaead712fc4@users.sourceforge.net> Date: Thu, 12 Oct 2017 12:40:43 +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: <8152401b-d68d-c4fe-2619-82a09e0c52ec@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 8bit X-Provags-ID: V03:K0:CgkYIN0Jr2zsJ+5ECTaqlhtzGIZxkpaNFo0RzQuXVFd2zZjHmlP XpMpVY2JJXa72Av6R5LO6dqiOH1zEb8yXlhyJIyqscuH/S+eTZFh3Zcv4b87byss9I9VCCH 0Jj66mEKPi29Bdo6sB8sG4GH2/2nsOGo6NntMfLv4FbegUt1KGiln8ZPJ06Y0IXVPzNNOww 0j4dLG9072xgPYotP+scw== X-UI-Out-Filterresults: notjunk:1;V01:K0:t2EMbhP6rxQ=:eHCUPzeVzEZFA/qYoK6JvA n0X8uteY58f4OgTzWCOKVGBdgXOCNPc6IJ/UtQFbophrOZewZT2d0ySiMdxWJ2vOkz5oPDa+5 bBWXiwt+7Ho/GXVG06h5n2CC6T6NLO9FrC5s0C/9QHcSZYR75F3VSRjK+yOEBc9Gmcl3+0iVC VLeZCqJmfuPaIr/cq89U6d7FM35CzvMvZRhwuIHfT1UEhqRM31it6rcrLTXILApZKBiMsu+EZ 5cHwtaeQHAtf70BtnlfNYOpDN8IO9XnMTmWupwUe0XsAHM4vhBImg8eYkXni7hOkEYB9xwwVx Xmubk4Vc07QHi56mDmTAYkkqM8MEtBmQCaM0pdcl/k1XtJVMuQHViFN+eZuENOBC8eFDy401V UjvsjQxz3Ydr79b97bfPbFm9T7468wkhqFR5l4tNIvHALZ9UDRP/xKZCUpY/yyB5mesTck/cU a8+WP/mnj/Sd2Nozew/AeBf7b98APch2dC9+/PrxtQY2cHTfzGaRgGc+IrBOui2BF6be02Y7a 7CiiF9VoVER19VxNEkJnqyf3XKcMmwHfedeEC9cjDsIyUwXUjdrvuicBOJUWX7IV6RtmnfB0Q 8GcNy7mEAf4wXrrzsRNmUZMM194UV9rBachKOkcakpMfiQoxbpEQXaOONL6S4Hi5Zj2+nJ6oC TD3m1MzyTxsuE+YXtV58UE51vXJz/Di3LZR+r5BHUjgUfiGVttPkT2SQLW1cCPQBMEcZkrTsY os7MNhdz6z9PQJJlwQg7SxeZbBUTikATpc0V3C1CcXprGSuXLpkAag0Y7OoXl+qOGARdSY4N9 3L93jTTCiCs0dKSUUCZkZgePAc/9bG7C8WUFrm0wDxs5yZm0Cg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Tue, 10 Oct 2017 21:10:43 +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 --- drivers/staging/irda/net/irias_object.c | 24 ++++-------------------- drivers/staging/irda/net/irlap_frame.c | 4 +--- drivers/staging/irda/net/irlmp.c | 1 - drivers/staging/irda/net/irttp.c | 1 - 4 files changed, 5 insertions(+), 25 deletions(-) diff --git a/drivers/staging/irda/net/irias_object.c b/drivers/staging/irda/net/irias_object.c index 1064fac2fd36..4db986b9d756 100644 --- a/drivers/staging/irda/net/irias_object.c +++ b/drivers/staging/irda/net/irias_object.c @@ -49,17 +49,12 @@ struct ias_object *irias_new_object( char *name, int id) struct ias_object *obj; obj = kzalloc(sizeof(*obj), GFP_ATOMIC); - if (obj == NULL) { - net_warn_ratelimited("%s(), Unable to allocate object!\n", - __func__); + if (!obj) return NULL; - } obj->magic = IAS_OBJECT_MAGIC; obj->name = kstrndup(name, IAS_MAX_CLASSNAME, GFP_ATOMIC); if (!obj->name) { - net_warn_ratelimited("%s(), Unable to allocate name!\n", - __func__); kfree(obj); return NULL; } @@ -319,11 +314,8 @@ void irias_add_integer_attrib(struct ias_object *obj, char *name, int value, IRDA_ASSERT(name != NULL, return;); attrib = kzalloc(sizeof(*attrib), GFP_ATOMIC); - if (attrib == NULL) { - net_warn_ratelimited("%s: Unable to allocate attribute!\n", - __func__); + if (!attrib) return; - } attrib->magic = IAS_ATTRIB_MAGIC; attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC); @@ -363,11 +355,8 @@ void irias_add_octseq_attrib(struct ias_object *obj, char *name, __u8 *octets, IRDA_ASSERT(octets != NULL, return;); attrib = kzalloc(sizeof(*attrib), GFP_ATOMIC); - if (attrib == NULL) { - net_warn_ratelimited("%s: Unable to allocate attribute!\n", - __func__); + if (!attrib) return; - } attrib->magic = IAS_ATTRIB_MAGIC; attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC); @@ -405,11 +394,8 @@ void irias_add_string_attrib(struct ias_object *obj, char *name, char *value, IRDA_ASSERT(value != NULL, return;); attrib = kzalloc(sizeof(*attrib), GFP_ATOMIC); - if (attrib == NULL) { - net_warn_ratelimited("%s: Unable to allocate attribute!\n", - __func__); + if (!attrib) return; - } attrib->magic = IAS_ATTRIB_MAGIC; attrib->name = kstrndup(name, IAS_MAX_ATTRIBNAME, GFP_ATOMIC); @@ -470,7 +456,6 @@ struct ias_value *irias_new_string_value(char *string) value->charset = CS_ASCII; value->t.string = kstrndup(string, IAS_MAX_STRING, GFP_ATOMIC); if (!value->t.string) { - net_warn_ratelimited("%s: Unable to kmalloc!\n", __func__); kfree(value); return NULL; } @@ -503,7 +488,6 @@ struct ias_value *irias_new_octseq_value(__u8 *octseq , int len) value->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC); if (value->t.oct_seq == NULL){ - net_warn_ratelimited("%s: Unable to kmalloc!\n", __func__); kfree(value); return NULL; } diff --git a/drivers/staging/irda/net/irlap_frame.c b/drivers/staging/irda/net/irlap_frame.c index 21891ef7ee33..d4d88a5d2976 100644 --- a/drivers/staging/irda/net/irlap_frame.c +++ b/drivers/staging/irda/net/irlap_frame.c @@ -433,10 +433,8 @@ static void irlap_recv_discovery_xid_rsp(struct irlap_cb *self, } discovery = kzalloc(sizeof(*discovery), GFP_ATOMIC); - if (!discovery) { - net_warn_ratelimited("%s: kmalloc failed!\n", __func__); + if (!discovery) return; - } discovery->data.daddr = info->daddr; discovery->data.saddr = self->saddr; diff --git a/drivers/staging/irda/net/irlmp.c b/drivers/staging/irda/net/irlmp.c index 38772a3b9df8..f075735e4b9b 100644 --- a/drivers/staging/irda/net/irlmp.c +++ b/drivers/staging/irda/net/irlmp.c @@ -641,7 +641,6 @@ struct lsap_cb *irlmp_dup(struct lsap_cb *orig, void *instance) /* Allocate a new instance */ new = kmemdup(orig, sizeof(*new), GFP_ATOMIC); if (!new) { - pr_debug("%s(), unable to kmalloc\n", __func__); spin_unlock_irqrestore(&irlmp->unconnected_lsaps->hb_spinlock, flags); return NULL; diff --git a/drivers/staging/irda/net/irttp.c b/drivers/staging/irda/net/irttp.c index 958bfbe38bfb..bcab5a60cd47 100644 --- a/drivers/staging/irda/net/irttp.c +++ b/drivers/staging/irda/net/irttp.c @@ -1443,7 +1443,6 @@ struct tsap_cb *irttp_dup(struct tsap_cb *orig, void *instance) /* Allocate a new instance */ new = kmemdup(orig, sizeof(*new), GFP_ATOMIC); if (!new) { - pr_debug("%s(), unable to kmalloc\n", __func__); spin_unlock_irqrestore(&irttp->tsaps->hb_spinlock, flags); return NULL; } -- 2.14.2