From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753391AbdARL5T (ORCPT ); Wed, 18 Jan 2017 06:57:19 -0500 Received: from mout.web.de ([212.227.17.12]:50370 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751585AbdARL5R (ORCPT ); Wed, 18 Jan 2017 06:57:17 -0500 Subject: [PATCH 2/4] alpha: Move two assignments for the variable "error" in osf_utsname() To: linux-alpha@vger.kernel.org, Al Viro , Ivan Kokshaysky , Jan-Benedict Glaw , Matt Turner , Nicolas Pitre , Richard Cochran , Richard Henderson , Thomas Gleixner References: Cc: LKML , kernel-janitors@vger.kernel.org From: SF Markus Elfring Message-ID: <5649cb94-620c-7b60-f150-a6838cafbfc6@users.sourceforge.net> Date: Wed, 18 Jan 2017 12:46:52 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:tDyQGeNJ0LXevQiCG132Kx1DfKu4uJvJliQbz1+uCtMbpZaj7JI Be6ouS7YltV2ZUshVxFqq32GKXMKWYk8yNsCQtmTN4tPZScuVMpPHkiY361GB8jiBStCLmT LHWGFR6hmGWgers/PVFeWvDbuRjeomOHgmUa4Jjy4vWBtSaMgerumPcyhGxCrs78bwgKvnv xKwNQbpSXYsRf6TgWhLkA== X-UI-Out-Filterresults: notjunk:1;V01:K0:3Uv6kop/PSs=:/J0k7yHUqLfhjcjiDWkttE cIQkOjjuFgHWwYyOV9GarPkdEDmClMMHVR7lYDNN6M6WUn2BN4mvLI1XKlDauTfaPwRDtIKXY DqLuxpnomBi3Z4QUwjLGdPyf9PO0alb7TvQR1K8SZkL+IgRJYYtv3dHjlLjyfDRRWc4sDFqiq jrD5mAJkHsVuQGWWlBj6mUQcLcoVadZ8Up5/44xm4L59xAZykugD3nT0lK+kJzm3EBwnwjLiV GXpHgvkeUsTVeT9Wfzt/elgz6fnabW3c0cV9+51wkumaM//ck4D8WY/LeLXXK5/uKFnP88JMw 0BnqaKT45eVspVKFr/gasl4tZ4/oCi746ZYbx8zkoS4lFP1SdWDl4LQpMhTYwcCywfG6SXtYK cy/PyMMymVq2axvqDxbUJdr+WRQU+91HT3li9z5MBoXNxO8Kf3JmGvL5xs7bN7XsA2sky3M+V CfngFqMSeIarm6K5l292rH9ckfS5Y1cgjXJL0g+dAuOHC/VFQkb4MZLdSWf4MPCvJLe8o+HYQ MDOAA+DRQ9xIwNChwbplX98tVGd9hwcZ/v6hc6h1OWKAlpvrDMfNbN1Zzn8plSY2JBsZzLl+J oTOm+P9l7m2innVS9rujsYDPPmS7hCp+NitXswUv6FYsBjfvfBHFpM2EEIKfqS+s/FGjbJzd4 6bqNSH2FMsvHZCgnk0no+lQ7cH8VCpnChTkLD74QipQdYbesH45lFJaVnZyo4q5LGFEYPrrk/ exghbbinWXZtnBQl5kPbF1PMeeV0Xxjgjb5e8ufBXWSGe8XeL0pvbWOJFXt9QDtW7SxWsb9lj 0GBci3D Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 18 Jan 2017 11:10:03 +0100 A local variable was set to an error code in one case before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. Signed-off-by: Markus Elfring --- arch/alpha/kernel/osf_sys.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 41174156a676..73ff5d698591 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -528,20 +528,14 @@ SYSCALL_DEFINE1(osf_utsname, char __user *, name) int error; down_read(&uts_sem); - error = -EFAULT; - if (copy_to_user(name + 0, utsname()->sysname, 32)) - goto out; - if (copy_to_user(name + 32, utsname()->nodename, 32)) - goto out; - if (copy_to_user(name + 64, utsname()->release, 32)) - goto out; - if (copy_to_user(name + 96, utsname()->version, 32)) - goto out; - if (copy_to_user(name + 128, utsname()->machine, 32)) - goto out; - - error = 0; - out: + if (copy_to_user(name + 0, utsname()->sysname, 32) || + copy_to_user(name + 32, utsname()->nodename, 32) || + copy_to_user(name + 64, utsname()->release, 32) || + copy_to_user(name + 96, utsname()->version, 32) || + copy_to_user(name + 128, utsname()->machine, 32)) + error = -EFAULT; + else + error = 0; up_read(&uts_sem); return error; } -- 2.11.0