From patchwork Thu Jan 19 20:33:14 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: SF Markus Elfring X-Patchwork-Id: 717311 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v4Fw92vKMz9rxm for ; Fri, 20 Jan 2017 07:35:37 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v4Fw928JQzDqlf for ; Fri, 20 Jan 2017 07:35:37 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.web.de (mout.web.de [212.227.15.14]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3v4Fv16CnfzDqYy for ; Fri, 20 Jan 2017 07:34:37 +1100 (AEDT) Received: from [192.168.1.2] ([77.181.224.32]) by smtp.web.de (mrweb001 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M4qsv-1cKNHs3OyD-00yzKH; Thu, 19 Jan 2017 21:33:17 +0100 To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Michael Ellerman , Paul Mackerras From: SF Markus Elfring Subject: [PATCH] powerpc/rtas_flash: Move an assignment for the variable "rc" in manage_flash_write() Message-ID: <026724c5-0907-d342-1fb3-f7af0bd1c765@users.sourceforge.net> Date: Thu, 19 Jan 2017 21:33:14 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 X-Provags-ID: V03:K0:o3u0V9ckA5lep4BlWznVInQCatpPyOtVE5CYEyHNID9FdMSct1h +yGtxEHeIWdeAQLa7GFCo+qxb7EuITjerB4FLoYhAl0xyXmktexY5J1ifXG2JGHd9gm6fjX BPRKm+k0z7AkarI+D0Ep5K1SbrDCUd9vTyjGkyTK6kE9cbKjUkk/SsAXwS2r/+BQf5fJ/Ef 2aYFIb7L5yZcAJ5davMYQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:tIMRvOS+s5o=:wJz12gWw46WyVfjXuCqnOh EhC6z5AG81DOsj3HB6FUQ9gCKPpuw3YS63FyeZvUeYJZdYpyu67EdHRXE2bYVaRSAmYAC/0qh cE/vC5gjxQltYbVBcPIE6SCC2cdH1hD6DxCrlJ25a/SfCktFR8eZztpoeGx1XYhaO7Kr5aIDl CIxrUQ2EDMxQSWRevWTrdA4eX/l4jliUQZBCW5EbGDqoAHEwraPKGeU29nZRnCXOm4j0K66iu t2NolIlH0b8pWIU3ZpLSvaggcAc5p+NH6drPEGaHE6JmBBf6ofiQy99kIFuR5e2HxjJqCSNnX CpX6n7XLsBB1yxIsqqIWWhyT2alRBYPsOoz3WJvFkW791s2ocE1LK+8dV6T5XIFZUBOhz9AHT Z7SFB+hPMuUrri3RLMgpkukY5JdGrgcparnuNUGKJdWQg/T6FhQCUWU945gBUd+G/TtqAfZIV AsTanmE8oeNXWoANJ8pw/f82KRa1/1PE2remBdTtjuNkes/E23wg0SvcwfRCDEpvk8B2JRxXK emt4qQXFzMqVMeKoTgtlrbgaI4/iuAsaGLD1kuKRdvPBTqT70dRyhnKkxoX5kYeyfawHJemJ3 ZmgOrKn+AWI6uC+l4mkYcY1LPd2aytJbi6QkoClg+42LBEA+jfWOweiuHR4OHa+l4JrVGPxAC sOUl6wNJVjq0r7MGlyGeRomziC14ksBbPItNxjNKRyISs5mYmm2Pbploj2T8J8YJkYakTb5sa ytGn17nqDUPvJt+/54iJMdEoqlC/N4MDVRCHfSGDl/7FPQ+uU+2Alqcago2xzDnnKwDPIDzMI fXMMxBJ X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kernel-janitors@vger.kernel.org, LKML Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Markus Elfring Date: Thu, 19 Jan 2017 21:20:09 +0100 A local variable was set to an error code before a concrete error situation was detected. Thus move the corresponding assignment into an if branch to indicate a software failure there. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/rtas_flash.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/rtas_flash.c b/arch/powerpc/kernel/rtas_flash.c index db2b482af658..663904beff67 100644 --- a/arch/powerpc/kernel/rtas_flash.c +++ b/arch/powerpc/kernel/rtas_flash.c @@ -419,9 +419,10 @@ static ssize_t manage_flash_write(struct file *file, const char __user *buf, op = -1; if (buf) { if (count > 9) count = 9; - rc = -EFAULT; - if (copy_from_user (stkbuf, buf, count)) + if (copy_from_user(stkbuf, buf, count)) { + rc = -EFAULT; goto error; + } if (strncmp(stkbuf, reject_str, strlen(reject_str)) == 0) op = RTAS_REJECT_TMP_IMG; else if (strncmp(stkbuf, commit_str, strlen(commit_str)) == 0)