From patchwork Tue Jul 14 14:23:28 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suraj Upadhyay X-Patchwork-Id: 1328921 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=vger.kernel.org (client-ip=23.128.96.18; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=ERtMDsp5; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by ozlabs.org (Postfix) with ESMTP id 4B5jS80KCnz9sQt for ; Wed, 15 Jul 2020 00:23:52 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728837AbgGNOXr (ORCPT ); Tue, 14 Jul 2020 10:23:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728822AbgGNOXn (ORCPT ); Tue, 14 Jul 2020 10:23:43 -0400 Received: from mail-pg1-x542.google.com (mail-pg1-x542.google.com [IPv6:2607:f8b0:4864:20::542]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E436C061755; Tue, 14 Jul 2020 07:23:43 -0700 (PDT) Received: by mail-pg1-x542.google.com with SMTP id j19so7644512pgm.11; Tue, 14 Jul 2020 07:23:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:mime-version:content-disposition :user-agent; bh=nUwXDB9+16lCViV2ieb7OxGP/wVfhQrqzyr+DjMiurg=; b=ERtMDsp5uK2mv9o92K1r3JhYGecnI/SKoRHHfjayrcNjsLKiVaQs7NZyiK2Q+10Sht 3cK/do2rdzhgu4DUcMdkDErJj5h/+EXadf6SvI/e+sFF+aX9cuggjwjOcZhhbQ1sQrf9 i8K1yc6lVGSBdXNBWA08Q7xG+9etQdusW77oOGZJvq8/uYza7GiTPmdar/C4O/xLxVKC 0n/ljFtxx5rvyxo7vz2W1DPareso8MxUV5Ahkoveh14+rXzODE9HcnWTUUN+BJwc2uay pKf1gUVDa7onWxWQc37G2GIBIr2qzsPEUjquYd7Po464u5oqynCswcmGLx31KjEVJTbB KRBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=nUwXDB9+16lCViV2ieb7OxGP/wVfhQrqzyr+DjMiurg=; b=J0C2vTCFp52TrtIoJeWbXBCgDLm28Md84WlN3BP3GxlRC5OoinNZbRu7KnkoZD0/JY kbsBYfEYZrMZ0rC9NFLVI3KJxEtfVhrpGrmAq6bfVmdO/6htf3pZ2TO+X7v3HPr1PguN yLogyjuERfP65qF9j6tGn45jPjUjeHI3aTJBOr6XxYs8xARmgo+vynQ/2qin+E3SU3OH rJBSalnJgzUZ+y9Mel8wYNai5sFah+KJM20rZCETNMjaK3HqpaR1OERoysjh+H0yDwRG 6TkiF1ZD8JYkNcT2OrrbMpqB6ti21FgT5xokGnM5N06Xy/+r577+sFo2orYnEF6fRdx0 o/zg== X-Gm-Message-State: AOAM531OXmvA2EZ097dOIjGMVG0DvWaOoL5IKR/GHa3egPcl2CetWmOQ RXEitQtcFYqJsotPFR7PhcM= X-Google-Smtp-Source: ABdhPJy66sR518CbHAyLwn4IDyvtCvNiLdLIxfxVc2XMIsw/eLRosLoQPV/oDLfKANqu2pgmoVCSSQ== X-Received: by 2002:a65:484c:: with SMTP id i12mr3739341pgs.145.1594736622688; Tue, 14 Jul 2020 07:23:42 -0700 (PDT) Received: from blackclown ([103.88.82.145]) by smtp.gmail.com with ESMTPSA id y19sm19009750pfc.135.2020.07.14.07.23.39 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 14 Jul 2020 07:23:41 -0700 (PDT) Date: Tue, 14 Jul 2020 19:53:28 +0530 From: Suraj Upadhyay To: davem@davemloft.net, kuba@kernel.org Cc: linux-decnet-user@lists.sourceforge.net, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH v2] decnet: dn_dev: Remove an unnecessary label. Message-ID: <20200714142328.GA4630@blackclown> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Remove the unnecessary label from dn_dev_ioctl() and make its error handling simpler to read. Signed-off-by: Suraj Upadhyay --- Changes: v2: Fixed indentation of break statement. On Julia's Advise. net/decnet/dn_dev.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/net/decnet/dn_dev.c b/net/decnet/dn_dev.c index 65abcf1b3210..15d42353f1a3 100644 --- a/net/decnet/dn_dev.c +++ b/net/decnet/dn_dev.c @@ -462,7 +462,9 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg) switch (cmd) { case SIOCGIFADDR: *((__le16 *)sdn->sdn_nodeaddr) = ifa->ifa_local; - goto rarok; + if (copy_to_user(arg, ifr, DN_IFREQ_SIZE)) + ret = -EFAULT; + break; case SIOCSIFADDR: if (!ifa) { @@ -485,10 +487,6 @@ int dn_dev_ioctl(unsigned int cmd, void __user *arg) rtnl_unlock(); return ret; -rarok: - if (copy_to_user(arg, ifr, DN_IFREQ_SIZE)) - ret = -EFAULT; - goto done; } struct net_device *dn_dev_get_default(void)