From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751694AbdARLzc (ORCPT ); Wed, 18 Jan 2017 06:55:32 -0500 Received: from mout.web.de ([212.227.17.11]:50689 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751275AbdARLz3 (ORCPT ); Wed, 18 Jan 2017 06:55:29 -0500 Subject: [PATCH 3/4] alpha: Return directly after a failed copy_from_user() or getname() in two functions 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: Date: Wed, 18 Jan 2017 12:47:54 +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:uVet0WuD2L2WSVh7PTPocDyn/SJNAdNLJ/EU9fk4JUk3FO28q0f s7aq6qUpk4vUo/nIzMzE129yb52LNI/HE5MTI51TT8KIOFW89pfbtNLdsIgTEiO1KhExNTz YlYPy7G1FgyIGzlrfAcmuBEzzeTKI7dGPTbWx8nHfCDQ3hPJgyHW9APj8Spr4jgDwkL/UJ3 JV5UgFX1Rb336w43MZIGw== X-UI-Out-Filterresults: notjunk:1;V01:K0:ZGk2p3ShxoE=:bNq3iWGxoT/kyg2IjolAxT FbUi+VBG48usMuU0FV3QTr130EKYH71VucEPVlHssfXurpSCJL710IPWWpDa3Pc9e4sEGQJUw tj0m3oEEBcT0lto1n/b841sgRsHrN2Sf8g8YyKCmD594Zg5PmDWY9d8uJQTtY1GwSHNDnfXsv kk2awv8xn4rvgqSbvEgxCQDdCF2jD9gvyuOxF1l0kZPhYyNC+HMlPPmE1x2FoV+6ZjbIsbSVj A4qFjP94rrQYcXgQRv8ylTodtXadsPNkaqnfmextW13ixWgleArc4e2H+FBLlyB7FfCyAFtx3 OnK2x82YLwd0dBWXjwZaVVh2vvMNQJ/kz81DGMYs18+etBkWgl1iooZGsl4CY0cG5GcNsCpXx fKMbEn1eeTX3Npc/F7J+kfFJ8c52Pg8dCytS67J03nCYHpkYOEdvCdILouvbbdvaH0BKm2lRy gtmFiqiKOdBR7DtywP/AdwS2gAuaQTFCFErSt2EaQ0h9f6GUx0JR/aePpwrXpEJOdxfReUk7Q 9tutVGfQWCQZS0yCFP7oT3eiV2CAw5oXe7rdnJSPf/Bdc/FcDqQIbJwmOG6ARB/p5zGLohfUF DjNH2t2nTOQVxYdcfV+00z5ol2UkFYJjAdwBxeEsTOujB1vPgxc+LISUhUdbnbWPkvPt9tunq Uy0aZ48S5+0SW5h4AAQxcegkg0RBd0qm8Sp6KG9XQnDircX/86sR8x49NcoWOjGHWjHlmbD5p 16LGQtLfPDb9r492xZtp1nOhzim3FNbC5hPiMZblKC0tQwNh6IFvNhB7Y3EK8uWhx2gzdV0rl OknuV70 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:30:06 +0100 Return directly after a call of the function "copy_from_user" or "getname" failed at the beginning. Signed-off-by: Markus Elfring --- arch/alpha/kernel/osf_sys.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c index 73ff5d698591..4310bc79d09c 100644 --- a/arch/alpha/kernel/osf_sys.c +++ b/arch/alpha/kernel/osf_sys.c @@ -454,16 +454,13 @@ osf_ufs_mount(const char __user *dirname, struct cdfs_args tmp; struct filename *devname; - retval = -EFAULT; if (copy_from_user(&tmp, args, sizeof(tmp))) - goto out; + return -EFAULT; devname = getname(tmp.devname); - retval = PTR_ERR(devname); if (IS_ERR(devname)) - goto out; + return PTR_ERR(devname); retval = do_mount(devname->name, dirname, "ext2", flags, NULL); putname(devname); - out: return retval; } @@ -475,16 +472,13 @@ osf_cdfs_mount(const char __user *dirname, struct cdfs_args tmp; struct filename *devname; - retval = -EFAULT; if (copy_from_user(&tmp, args, sizeof(tmp))) - goto out; + return -EFAULT; devname = getname(tmp.devname); - retval = PTR_ERR(devname); if (IS_ERR(devname)) - goto out; + return PTR_ERR(devname); retval = do_mount(devname->name, dirname, "iso9660", flags, NULL); putname(devname); - out: return retval; } -- 2.11.0