From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753851AbdARLps (ORCPT ); Wed, 18 Jan 2017 06:45:48 -0500 Received: from mout.web.de ([212.227.17.11]:55190 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753567AbdARLpp (ORCPT ); Wed, 18 Jan 2017 06:45:45 -0500 Subject: [PATCH 1/4] alpha: Return an error code only as a constant in osf_sigstack() 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: <95ac67c7-6a80-6d58-a8c2-43701e76ecdc@users.sourceforge.net> Date: Wed, 18 Jan 2017 12:45:13 +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:lLLOqUyC1MszGn02jId5tWFsA9bhPIfE+PyXfQKu6r9hSPMvjfs EOj8xPAIqenTOwiKgFIyAGo02ms1rFmPu2X0kjomtmZ4lxi2RpQHFJjVw8te70+RWGzWv8e p3myw7N4pdvGxedh4bB7Y7E1ML4qybqiZmsaxcbXk2TWRHwvkEJmJkXpO2uRLirvI0ClQ8y jTWWcsGCiCHWitCROpMNA== X-UI-Out-Filterresults: notjunk:1;V01:K0:AX4ebNxDUEU=:hXE7juU5yvly2rQTE5X4F7 Ih9wf4IaHs1ZTnN1nATiuyOgo2cM9QzGl7o0bRWKxeFXucOR43wO7BH0H2544lJ8SIwpx05Lp k1s34qVKtc4gUeUcGYsZMIvkJX/ooz0I6MzIWwNtjQWvJ5wkUpOJ9mrao0khhoV4B0AT14Dye Xqjm+2n1ky39ypn7II/ravpi6+qtNb+vCkftKfgiyecBNcG45JIKbSrR9hYBzLOPs5+MQ+gdr enL7YZ/3M+aj+7lfrj4f6CeAHgcRZ+aUg8pX7tO3oJWqNb2F/qp1bGEtF8SKkig2D6pLOJhSo pjP9cVNO4LZLUmIoHbZrTKOQhsDt5MxgmrpXD5og1/iC5OclWgLQ697WTlk7Pnvc0oQ5p23N5 YpkKB70h0E17nRQHbEOJKJdepN6XtqBs7OVSVvMJ7uQ81VZDA9DvqxgqfQJ8vYV0Ww8rhyH/H 3RYPL3GumXeSBSyi0xNH50WADwF8SxJ3KNfMx+Pg71lSiYENwcIU53lv/3XS+OWsmn11oBgpR Vr/iSbjsO2TTNg/cC9PC64gryv52U7cXTbqZPQWF939TUOJn6VTT2K6gov08WmTNI7xHnu1qp mfl+ohift+i0z34S2kmLdPrPOoXNZ2w6Gqn1FnSDzBengRgl+EdTY+X0dG+FbYjzINLuQZSfl Z5cOuE3EfWxnRo6gaZIu+xpfqvCWOzlzpGC1BlANyP7QvVKeHRpxlaLFnEjn89GM/puVI1Ib8 49TA5CiYQh7ZrenSkMG67B3b33T42r0cOK0Qv4IHF2aJ0Hz6R8b2EtfvtRjz2SU/weCXGCUOu bEh92XX 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 10:40:51 +0100 * Return an error code without storing it in an intermediate variable. * Delete the local variable "error" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/alpha/kernel/osf_sys.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 56e427c7aa3c..41174156a676 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -691,20 +691,17 @@ SYSCALL_DEFINE2(osf_sigstack, struct sigstack __user *, uss, unsigned long usp = rdusp(); unsigned long oss_sp = current->sas_ss_sp + current->sas_ss_size; unsigned long oss_os = on_sig_stack(usp); - int error; if (uss) { void __user *ss_sp; - error = -EFAULT; if (get_user(ss_sp, &uss->ss_sp)) - goto out; + return -EFAULT; /* If the current stack was set with sigaltstack, don't swap stacks while we are on it. */ - error = -EPERM; if (current->sas_ss_sp && on_sig_stack(usp)) - goto out; + return -EPERM; /* Since we don't know the extent of the stack, and we don't track onstack-ness, but rather calculate it, we must @@ -714,16 +711,12 @@ SYSCALL_DEFINE2(osf_sigstack, struct sigstack __user *, uss, } if (uoss) { - error = -EFAULT; if (! access_ok(VERIFY_WRITE, uoss, sizeof(*uoss)) || __put_user(oss_sp, &uoss->ss_sp) || __put_user(oss_os, &uoss->ss_onstack)) - goto out; + return -EFAULT; } - - error = 0; - out: - return error; + return 0; } SYSCALL_DEFINE3(osf_sysinfo, int, command, char __user *, buf, long, count) -- 2.11.0