From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753771AbdASRD4 (ORCPT ); Thu, 19 Jan 2017 12:03:56 -0500 Received: from mout.web.de ([212.227.15.3]:55937 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753174AbdASRDw (ORCPT ); Thu, 19 Jan 2017 12:03:52 -0500 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> Cc: LKML , kernel-janitors@vger.kernel.org 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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); -- 2.11.0