From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756003AbdARL6C (ORCPT ); Wed, 18 Jan 2017 06:58:02 -0500 Received: from mout.web.de ([217.72.192.78]:63478 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755559AbdARL57 (ORCPT ); Wed, 18 Jan 2017 06:57:59 -0500 Subject: [PATCH 4/4] alpha: Move two assignments for the variable "res" in srm_env_proc_write() 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: <986573fa-e636-f864-14dc-5e65a31b454e@users.sourceforge.net> Date: Wed, 18 Jan 2017 12:50:17 +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:ADVnc89Izosg0fYVqpRlvoKng/zeOZE3nQ0b38Y3fg9xpO7JjJk jMcrg/lobrlcWn0NE4AkBB6fjEJ/59bZHq2N35YbaentO00g3QSbvdwDMHoaALdP5o4XP4b xmYQmSMfNd79z4a7zIv7M7aIiacQxFhidwp8vVoXUYMqXMbvasROHorKHpdG3svSHiXJ0g9 0fzrcEcFRZAOWdRX2kNuQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:PtkS+yPh29c=:Y0+pSBvifwDElEJ/810x7L d9D+u44mtcfUwooUxzLaoUTbeteCcmPd0+ffl7dZ2yIXNDer0a0oL4uDZMt8sKz7dPy0f6PVh y9TMsRymD/5YJeGdwES4dfOsGq7f48XsWqY9TCyh1Su82laNUM3eoL7tc5H0fvhmMlFzb8QiQ YPM8c7Sf+qCcPPk8dgeDwA5YPE5QUNThGZ4Y4g0Yiwrpn3DlJonRp0WUXEsR5cGbKQFu0A7OZ gqw8z7WRT8I7tDotEU+gjt1onXM9HGlHBMDzzjMJpZ2ceMuB2GRVKfQOjhJBX+RSEqjfcdUC4 Z5rN7/yP3irFUR/jmQUdzuBO+kcArNIEj0nQLkFYDvaV/lQLf/eI8g3ofLiRCtkjClvNzHl7K bxwJ9CVlYOR4q6wN9k2/o7RKl05QtKv21fAGt8xpZkirLG4DNwEYfTVdtnqTyzQzxgvTyErff LUSaCBYVjQ+WqI1RQOmwSpTFFYnou7+1q8dVrgUmXPc9eBXudZ9XAeFE1EkxLrGsZ4tyimp/6 0rOy5l7Q3R/oTS4ZAteagRFlJ+ojv2GojmFc5lbnSq2NlzVCt1kZBIjLZRQt6IPeMK0SLQws1 r5r1fsqHOUg2wPcyxaBbiQkFuHJMNCK/nk9woyFnFt4YL24AYkqrISCOrDZyOuH3SjBJp7yLf q/CD94shwVimKMeDAh58fx9Xlh981G/e+C/YydwuVFRhjpWSjwSaRSImuwRtvK7GOvLt+z4i4 XNJ4MK0NmXvPNxlVTlXV2/HAga842Pj4vtnqLan+YJ3EVDHt0zrOmzu8wr0NFksm0AVXSsgKm N6GeH/s 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 12:08:44 +0100 A local variable was set to an error code in two cases 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/alpha/kernel/srm_env.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/arch/alpha/kernel/srm_env.c b/arch/alpha/kernel/srm_env.c index ffe996a54fad..a5f182780578 100644 --- a/arch/alpha/kernel/srm_env.c +++ b/arch/alpha/kernel/srm_env.c @@ -113,13 +113,15 @@ static ssize_t srm_env_proc_write(struct file *file, const char __user *buffer, if (!buf) return -ENOMEM; - res = -EINVAL; - if (count >= PAGE_SIZE) + if (count >= PAGE_SIZE) { + res = -EINVAL; goto out; + } - res = -EFAULT; - if (copy_from_user(buf, buffer, count)) + if (copy_from_user(buf, buffer, count)) { + res = -EFAULT; goto out; + } buf[count] = '\0'; ret1 = callback_setenv(id, buf, count); -- 2.11.0