From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753982AbdASQyY (ORCPT ); Thu, 19 Jan 2017 11:54:24 -0500 Received: from mout.web.de ([212.227.17.12]:59990 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753769AbdASQyU (ORCPT ); Thu, 19 Jan 2017 11:54:20 -0500 Subject: [PATCH 1/8] powerpc/nvram: Return directly after a failed parameter validation 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: <5a23fa96-5227-3bcd-414d-65b2ae1f2f52@users.sourceforge.net> Date: Thu, 19 Jan 2017 17:53:57 +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:nxwmq0SWpArEkes7L5vSa0gOWvShph+CpCeCS886DfP3IkjkGYW t23+zk3th2ZicjteDerNwD+JXBs0IaNp5WK2r0NU0ziGcZiHmTYlS95Yracunhi61cpyDPL 2u6/sTI98iY6opyyHDLq+O4ugQGO+IDjad67CzoD51zbrgXwsnuQe3JYJMcT2Bz3bGWemLx mBnlNnP1R1RKaQMrRrb8g== X-UI-Out-Filterresults: notjunk:1;V01:K0:bNHgmrlIWXY=:rhVTDmH+I91Uz36S7Mwr27 L9HeJW1YU58ibMuhZnusPalFIsr53q8YoF8K3hZCIzmuxxRJWLWb9lj22ICbPKi0TwYvdEgr6 wVsAnlxkBuZw0Y9cc5qPBram9+iETaiMYtR/vrXvgGsF+dslb/P/Br4Cw30qm2VUG+RBk/AHo zDhRJy03SK8I1/7nZt/drdbpWWCUKt+0dW8uC/eRRF1WAfUWHoFZcofVIj04js5gmi14gnLzc gtDcLIq4qILPeLjZHYtFUbIc32RIUAKN5tnZA/wV7YQZOJkDuqehgtf5gYAYBIKRNXp63Y1qf TDwyff67H3m6HJpcTTGUx/97HoajuiNiSvkz4BkPvUSXgoj/h0j8VvAHHL7upV0yJ+zxdiIOX IJJwHs3GU4Kzgl+oMdWdZbpmYNLGG7cUGvyOu4qoaoTpMz5rOYxdiLHW7cZrLFkAV43SKY9Hm GbmLlKBuvInhh8vjgXmVd4uoQrNy4tY3MegyIBFW3nms7eguGxT8Lvf/cDSWw6UdrO4ByRDHt ANSwvztl9mN/0j7QmzueYI7tvzycMkX4S+yKzNVdkb0J1pdZdlEQrV1wroaMldBI5gRCm+I5f h0DB4H+lyTd/rOqWdl6M5ApazQ9JbXjup1GjqbKN55sxARbMQLJQu7/tcr9COBKpg5ajRoNl9 TNBPPpsqqXfnTSIRVSMJa311fr2om43jM8EKxoIRD1QQaVk4MNsjSMkLanM5lI29qfSmopI54 YgoezfOjLAMFD2OIfsBBCBiNg1NSu6qF7SKpZwEeZbH9WIJkenrXiPaeM2pVGazELtpHJ3IRL VcHfRP7 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:22:56 +0100 * Return directly after an inappropriate input parameter was detected. * Delete an initialisation for the variable "tmp" at the beginning and an assignment for the variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/nvram_64.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index 34d2c595de23..37d08b95c3f0 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -790,17 +790,15 @@ static ssize_t dev_nvram_write(struct file *file, const char __user *buf, size_t count, loff_t *ppos) { ssize_t ret; - char *tmp = NULL; + char *tmp; ssize_t size; - ret = -ENODEV; if (!ppc_md.nvram_size) - goto out; + return -ENODEV; - ret = 0; size = ppc_md.nvram_size(); if (*ppos >= size || size < 0) - goto out; + return 0; count = min_t(size_t, count, size - *ppos); count = min(count, PAGE_SIZE); -- 2.11.0