All of lore.kernel.org
 help / color / mirror / Atom feed
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: devel@driverdev.osuosl.org, netdev@vger.kernel.org,
	Al Viro <viro@zeniv.linux.org.uk>,
	Corentin Labbe <clabbe.montjoie@gmail.com>,
	David Howells <dhowells@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	Georgiana Chelu <georgiana.chelu93@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Johannes Berg <johannes.berg@intel.com>,
	Julia Lawall <julia.lawall@lip6.fr>,
	Samuel Ortiz <samuel@sortiz.org>,
	Srishti Sharma <srishtishar@gmail.com>,
	Stephen Hemminger <stephen@networkplumber.org>,
	Yuan Linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 08/10] staging/irda/net: Use common error handling code in irias_new_object()
Date: Thu, 12 Oct 2017 10:48:03 +0000	[thread overview]
Message-ID: <c7db5b0d-2bd4-367c-bd29-4c33155bb22d@users.sourceforge.net> (raw)
In-Reply-To: <8152401b-d68d-c4fe-2619-82a09e0c52ec@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 12 Oct 2017 08:52:53 +0200

Add a jump target so that a bit of exception handling can be better
reused at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/staging/irda/net/irias_object.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/irda/net/irias_object.c b/drivers/staging/irda/net/irias_object.c
index 4c2c65e28836..0c89800d597d 100644
--- a/drivers/staging/irda/net/irias_object.c
+++ b/drivers/staging/irda/net/irias_object.c
@@ -54,10 +54,9 @@ struct ias_object *irias_new_object( char *name, int id)
 
 	obj->magic = IAS_OBJECT_MAGIC;
 	obj->name = kstrndup(name, IAS_MAX_CLASSNAME, GFP_ATOMIC);
-	if (!obj->name) {
-		kfree(obj);
-		return NULL;
-	}
+	if (!obj->name)
+		goto free_object;
+
 	obj->id = id;
 
 	/* Locking notes : the attrib spinlock has lower precendence
@@ -68,11 +67,14 @@ struct ias_object *irias_new_object( char *name, int id)
 		net_warn_ratelimited("%s(), Unable to allocate attribs!\n",
 				     __func__);
 		kfree(obj->name);
-		kfree(obj);
-		return NULL;
+		goto free_object;
 	}
 
 	return obj;
+
+free_object:
+	kfree(obj);
+	return NULL;
 }
 EXPORT_SYMBOL(irias_new_object);
 
-- 
2.14.2


WARNING: multiple messages have this Message-ID (diff)
From: SF Markus Elfring <elfring@users.sourceforge.net>
To: devel@driverdev.osuosl.org, netdev@vger.kernel.org,
	Al Viro <viro@zeniv.linux.org.uk>,
	Corentin Labbe <clabbe.montjoie@gmail.com>,
	David Howells <dhowells@redhat.com>,
	"David S. Miller" <davem@davemloft.net>,
	Georgiana Chelu <georgiana.chelu93@gmail.com>,
	Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
	Johannes Berg <johannes.berg@intel.com>,
	Julia Lawall <julia.lawall@lip6.fr>,
	Samuel Ortiz <samuel@sortiz.org>,
	Srishti Sharma <srishtishar@gmail.com>,
	Stephen Hemminger <stephen@networkplumber.org>,
	Yuan Linyu <Linyu.Yuan@alcatel-sbell.com.cn>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 08/10] staging/irda/net: Use common error handling code in irias_new_object()
Date: Thu, 12 Oct 2017 12:48:03 +0200	[thread overview]
Message-ID: <c7db5b0d-2bd4-367c-bd29-4c33155bb22d@users.sourceforge.net> (raw)
In-Reply-To: <8152401b-d68d-c4fe-2619-82a09e0c52ec@users.sourceforge.net>

From: Markus Elfring <elfring@users.sourceforge.net>
Date: Thu, 12 Oct 2017 08:52:53 +0200

Add a jump target so that a bit of exception handling can be better
reused at the end of this function.

Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
---
 drivers/staging/irda/net/irias_object.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/irda/net/irias_object.c b/drivers/staging/irda/net/irias_object.c
index 4c2c65e28836..0c89800d597d 100644
--- a/drivers/staging/irda/net/irias_object.c
+++ b/drivers/staging/irda/net/irias_object.c
@@ -54,10 +54,9 @@ struct ias_object *irias_new_object( char *name, int id)
 
 	obj->magic = IAS_OBJECT_MAGIC;
 	obj->name = kstrndup(name, IAS_MAX_CLASSNAME, GFP_ATOMIC);
-	if (!obj->name) {
-		kfree(obj);
-		return NULL;
-	}
+	if (!obj->name)
+		goto free_object;
+
 	obj->id = id;
 
 	/* Locking notes : the attrib spinlock has lower precendence
@@ -68,11 +67,14 @@ struct ias_object *irias_new_object( char *name, int id)
 		net_warn_ratelimited("%s(), Unable to allocate attribs!\n",
 				     __func__);
 		kfree(obj->name);
-		kfree(obj);
-		return NULL;
+		goto free_object;
 	}
 
 	return obj;
+
+free_object:
+	kfree(obj);
+	return NULL;
 }
 EXPORT_SYMBOL(irias_new_object);
 
-- 
2.14.2

  parent reply	other threads:[~2017-10-12 10:48 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-10-12 10:38 [PATCH 00/10] staging/irda/net: Adjustments for several function implementations SF Markus Elfring
2017-10-12 10:38 ` SF Markus Elfring
2017-10-12 10:39 ` [PATCH 01/10] staging: irda: Improve a size determination in 20 functions SF Markus Elfring
2017-10-12 10:39   ` SF Markus Elfring
2017-10-12 10:40 ` [PATCH 02/10] staging: irda: Delete ten error messages for a failed memory allocation SF Markus Elfring
2017-10-12 10:40   ` SF Markus Elfring
2017-10-12 10:42 ` [PATCH 03/10] staging/irda/net: Adjust 385 checks for null pointers SF Markus Elfring
2017-10-12 10:43 ` [PATCH 04/10] staging/irda/net: Delete an unnecessary variable initialisation in irlap_recv_discover SF Markus Elfring
2017-10-12 10:43   ` [PATCH 04/10] staging/irda/net: Delete an unnecessary variable initialisation in irlap_recv_discovery_xid_cmd() SF Markus Elfring
2017-10-12 10:45 ` [PATCH 05/10] staging/irda/net: Delete an unnecessary variable initialisation in irlap_recv_discover SF Markus Elfring
2017-10-12 10:45   ` [PATCH 05/10] staging/irda/net: Delete an unnecessary variable initialisation in irlap_recv_discovery_xid_rsp() SF Markus Elfring
2017-10-12 10:46 ` [PATCH 06/10] staging/irda/net: Delete an unnecessary variable initialisation in two functions SF Markus Elfring
2017-10-12 10:46   ` SF Markus Elfring
2017-10-12 10:47 ` [PATCH 07/10] staging/irda/net: Delete an unnecessary variable initialisation in four functions SF Markus Elfring
2017-10-12 10:47   ` SF Markus Elfring
2017-10-12 10:48 ` SF Markus Elfring [this message]
2017-10-12 10:48   ` [PATCH 08/10] staging/irda/net: Use common error handling code in irias_new_object() SF Markus Elfring
2017-10-12 10:49 ` [PATCH 09/10] staging/irda/net: Combine some seq_printf() calls in two functions SF Markus Elfring
2017-10-12 10:49   ` SF Markus Elfring
2017-10-12 10:50 ` [PATCH 10/10] staging/irda/net: Use seq_puts() in four functions SF Markus Elfring
2017-10-12 10:50   ` SF Markus Elfring
2017-10-12 11:17 ` [PATCH 00/10] staging/irda/net: Adjustments for several function implementations Bjørn Mork
2017-10-12 11:17   ` Bjørn Mork
2017-10-12 13:45   ` SF Markus Elfring
2017-10-12 13:45     ` SF Markus Elfring

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=c7db5b0d-2bd4-367c-bd29-4c33155bb22d@users.sourceforge.net \
    --to=elfring@users.sourceforge.net \
    --cc=Linyu.Yuan@alcatel-sbell.com.cn \
    --cc=clabbe.montjoie@gmail.com \
    --cc=davem@davemloft.net \
    --cc=devel@driverdev.osuosl.org \
    --cc=dhowells@redhat.com \
    --cc=georgiana.chelu93@gmail.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=johannes.berg@intel.com \
    --cc=julia.lawall@lip6.fr \
    --cc=kernel-janitors@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=samuel@sortiz.org \
    --cc=srishtishar@gmail.com \
    --cc=stephen@networkplumber.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.