From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754710AbdKAORN (ORCPT ); Wed, 1 Nov 2017 10:17:13 -0400 Received: from mout.web.de ([212.227.15.3]:59612 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754551AbdKAORK (ORCPT ); Wed, 1 Nov 2017 10:17:10 -0400 Subject: [PATCH v2] can: Use common error handling code in vxcan_newlink() To: Marc Kleine-Budde , Oliver Hartkopp , Wolfgang Grandegger , linux-can@vger.kernel.org, "netdev@vger.kernel.org" Cc: LKML , kernel-janitors@vger.kernel.org References: <2e600d9a-faec-dd39-08f0-5a7fb260d7ca@users.sourceforge.net> <2ab5d794-7a5c-9036-835c-67cfcc541795@hartkopp.net> <264b3c2b-8354-5769-639c-ac8d2fcbe630@hartkopp.net> From: SF Markus Elfring Message-ID: <23fbbdba-fb11-a6bc-7d6a-4af43ef79503@users.sourceforge.net> Date: Wed, 1 Nov 2017 15:16:59 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <264b3c2b-8354-5769-639c-ac8d2fcbe630@hartkopp.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:2Cvn/koEj9b8BNkFomfABFQmRQIZ2EcjW0uzEVmARpfu0G7rStV je9j46vr0//YM0Nt71WZmk6wm56nDdFH3g5He7pk+q5ttZIXglTqZ+ZR3KGuAMp0qa+usoI MXKhOSoqJPjpBO4B+ceYRpXvxewz3G5YEwzdt2oi210kE7sXZei1mwyF9Fy9lG8Ny8QjVCu PTDwl6uaOwnhOKx/Tu+RA== X-UI-Out-Filterresults: notjunk:1;V01:K0:3UzyDGvYqFs=:Mdina6HAO4wCh4jLHw6y0w B1yXkZxQG/Rg7XZ84HVmsFAr6ixKvgSud0J4zq2fGzrrM04nuvV4RXLxpqj4qBRVXFkn09ZDV hcxv1SRT9BSoiF5wr8ArnJmoOTNdBCMUdkI6aryC9t6kQo7788PreIRsaLlWXhbz8U4DdRC31 1kjHSpDbrG/nxmrDg4i5YOADyhIkEumLdYMchDt2ivyV7gEB0r+aKLGRiYQEKDSOfBrEaC4DL ZAkQJ3cO3DXHLuoASZqVw3YgvOOBoLPfWnxdZXYbPfh8nrcj4/t6DAUYOUhUhripPV3TxGnjz gNuKFm0B8uGSbw4FcsolZHvQ3DMImnEV+jeGkXFNX1LJrf7bcCQ8BpAoOErH6MdZywOJ59Cqe UahJxB1OFyu017MLlDw2+ssAifL9CHd4YDgAxGSEDq++l3LUjJ9M7sG43OYdymi8I4+t59wlx 10AT6ivQVJz4K5v9zPnTlqGxsAsFRj6rhplgr6nCKb3HupL/bHd6NzOGa6kWT+cJqm4iBJ8T6 1FdlJV9WZAmoHRYqEJU/zfD9yZUUyilkjS14Mt1AMbc/NQsMYSday95CJI6/sG2i/aOi4HQik fy2aa3vmyKL4kFx1k3d89IiQdszHYIegLZRBBIH3aYUXMjv/yoDsgDsAFa8FEy6xKf1knmZEd 2i+pc7gVqkVZR2feLW5I4xWYg5Hakdembbt/WXbHjod9hQRM2tU3kYOfd+cB2kTC2Ysw5kszq h2QUuwAlLD1IeGOyh4Y+vR2pHXeNrzEOZwn1/zGiFPXJpuo5miEDsUB3tRC3y2VtW47J7uRSm Tt6VgEh1MRNE+V8bVXlIVihdZKoBFXpHs1cTUUU8LEHF9CfMOQ= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 1 Nov 2017 14:56:15 +0100 Add a jump target so that a bit of exception handling can be better reused at the end of this function. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- v2: An approach to make two checks for a failure predicate a bit safer was rejected on 2017-10-28. The possibility remains to reconsider such an adjustment later again. https://lkml.org/lkml/2017/10/28/125 https://lkml.kernel.org/r/<264b3c2b-8354-5769-639c-ac8d2fcbe630@hartkopp.net> drivers/net/can/vxcan.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/net/can/vxcan.c b/drivers/net/can/vxcan.c index 8404e8852a0f..5d1753cfacea 100644 --- a/drivers/net/can/vxcan.c +++ b/drivers/net/can/vxcan.c @@ -227,10 +227,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, netif_carrier_off(peer); err = rtnl_configure_link(peer, ifmp); - if (err < 0) { - unregister_netdevice(peer); - return err; - } + if (err < 0) + goto unregister_network_device; /* register first device */ if (tb[IFLA_IFNAME]) @@ -239,10 +237,8 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, snprintf(dev->name, IFNAMSIZ, DRV_NAME "%%d"); err = register_netdevice(dev); - if (err < 0) { - unregister_netdevice(peer); - return err; - } + if (err < 0) + goto unregister_network_device; netif_carrier_off(dev); @@ -254,6 +250,10 @@ static int vxcan_newlink(struct net *net, struct net_device *dev, rcu_assign_pointer(priv->peer, dev); return 0; + +unregister_network_device: + unregister_netdevice(peer); + return err; } static void vxcan_dellink(struct net_device *dev, struct list_head *head) -- 2.14.3