From patchwork Thu Jan 19 16:56:35 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: 717248 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 3v49S609JJz9s3s for ; Fri, 20 Jan 2017 04:14:30 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v49S56XTczDqd7 for ; Fri, 20 Jan 2017 04:14:29 +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.3]) (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 3v49D62xqkzDqQF for ; Fri, 20 Jan 2017 04:04:05 +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 0M7scS-1cGrtl2HyK-00vPHc; Thu, 19 Jan 2017 17:56:37 +0100 Subject: [PATCH 3/8] powerpc/nvram: Move an assignment for the variable "ret" in dev_nvram_write() To: linuxppc-dev@lists.ozlabs.org, Benjamin Herrenschmidt , Daniel Axtens , Geliang Tang , Michael Ellerman , Nathan Fontenot , Pan Xinhui , Paul Gortmaker , Paul Mackerras References: <53545d97-6ed5-ff17-384f-82e72b3592f9@users.sourceforge.net> From: SF Markus Elfring Message-ID: Date: Thu, 19 Jan 2017 17:56:35 +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: <53545d97-6ed5-ff17-384f-82e72b3592f9@users.sourceforge.net> X-Provags-ID: V03:K0:ObErlTCAGpZE1UTWkkdYPn2w8zx/vq5+tk1+jspRrGMpVuQLK+L EDbvutobeL1cKTdKvaaaNoiZP8ploYE0oeFOkpFs3p6nmQ7ON+IYorpYGjjgahfdQ1B7PAT voIRsqoX4SWUfslp3P1GXkQ6Okk60SKEH6RUcocdqoWKM7LvT6OyVh0ewkaYO4SsPA6FvKB gg+8IcRdLFacWOpB3xCFw== X-UI-Out-Filterresults: notjunk:1; V01:K0:eE/2LzFo+AE=:OEI/SCzU9lW5ShQF7Y2RQI XnDLaHaPoGJF54r26kVGaFaYbvZs2islVs/vhDMvvHeK1ksl9E9IcW5njRsVsssBKfFLq9GMO NrOIDzBzQ+Q+nwKtYX1YGkM35FsYkrSvSPfT0TSm/aCGBAvOUOkifRs5+6kurI+tw2RckT6XS MdxTReGbeu5wtRsIsedvpSbVNB5PfoUdV2jg0uaqMhQZu+p8y2Im42ctak049UdWJhvO4rpko zdf1w3wK3+crPTUSCZelcpMIZPtARX66wuKWBtld7XLVrKByV/D9K1D0wvEwrTgJp6pguu+xN VpHpViQHogC5phtk4TSOL3xZcv+ObPWVdC0sQEuk0hhBHzoXA9r8nc3W00apDeSuVsDNys8j0 0SR5/B64OEFnUvJqkDp2pMw3jiD6ox9lm/ixBciqvgZZiLX0PID9Vg0lT6o2IX+C5NPMRn7ND OI1ur1/ACmlAJdxneKTJOips5LohdX94sAS9FlXH+k7G2uqnLqgIaGKcrmYzIJ6CQ45Ji6hvu /X13tfUvSJ100+A1Hy1yvrroGrQAY22ErTtyBR9tqmP9Ffw1ArIXXfGMR4sYLZEMGa+M5nA9X GTpHJY2TBVZvFIuteEby38dPdmf7KXDdHjiJT9Ch8HCsyYvXFIq4YAQ2Y50C1Me4itZEIIA5c ei1FKyj0+m995Wq4BKvt2dadjEgIpvDmnErICmTmHK0pdzkGytlspKe2wVhmdzYJ2gmJAc14T AgwbGt3hct3lzCrTLfFZfmqmQyC0BIdvqVqmshuk2bp8bc8L/kcyk2+fqYeUswLRlBqVxupfG iW+p+37 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 15:55:36 +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/nvram_64.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index cf839adf3aa7..dc90a0e9ad65 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -806,9 +806,10 @@ static ssize_t dev_nvram_write(struct file *file, const char __user *buf, if (!tmp) return -ENOMEM; - ret = -EFAULT; - if (copy_from_user(tmp, buf, count)) + if (copy_from_user(tmp, buf, count)) { + ret = -EFAULT; goto out; + } ret = ppc_md.nvram_write(tmp, count, ppos);