From patchwork Thu Jan 19 16:53:57 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: 717262 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 3v49bb0nsWz9sxN for ; Fri, 20 Jan 2017 04:20:59 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v49bZ4lH1zDqnP for ; Fri, 20 Jan 2017 04:20:58 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 519 seconds by postgrey-1.36 at bilbo; Fri, 20 Jan 2017 04:08:49 AEDT Received: from mout.web.de (mout.web.de [217.72.192.78]) (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 3v49KY3NhbzDqX8 for ; Fri, 20 Jan 2017 04:08:49 +1100 (AEDT) Received: from [192.168.1.2] ([77.181.224.32]) by smtp.web.de (mrweb103 [213.165.67.124]) with ESMTPSA (Nemesis) id 0Lr2VT-1c0A1J2BYx-00efY5; Thu, 19 Jan 2017 17:54:03 +0100 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> 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> X-Provags-ID: V03:K0:nxwmq0SWpArEkes7L5vSa0gOWvShph+CpCeCS886DfP3IkjkGYW t23+zk3th2ZicjteDerNwD+JXBs0IaNp5WK2r0NU0ziGcZiHmTYlS95Yracunhi61cpyDPL 2u6/sTI98iY6opyyHDLq+O4ugQGO+IDjad67CzoD51zbrgXwsnuQe3JYJMcT2Bz3bGWemLx mBnlNnP1R1RKaQMrRrb8g== X-UI-Out-Filterresults: notjunk:1; V01:K0:K/OStwtWn7Y=:wDIsYt9JFS4Eu5HyBwujKS 0qgqd8OKSpw7E2KENZYHxxY6Wo0RKb8k0jfs/O+ezmSd4YFu+v+C7KggnsxWOZUHFp9QIoHnM V19hwSnddWxvQSU/0CZtH+Zn1XxLxFVGPOHqoDxvR6k2KSf+pp0TgfVxh2SiaFChfBuOSJcmJ RXGCdrjri1swNqgag6UIbyChST1vk1M4pxK+Bj3gKH3yZzNyff4o9m1tIr4AVVF+8EFTMGgLD vICicKnrgbEQ4KzOggkcJQ6ULgySWEgCitTAyBP7q1OyYC1IiLC8RfFfPKRpLCJKJCid+QwJy NFo11JWX457ltU75+9Mqr1flamd2quRynUugS8cOa5hmtIX9r/6878JFRPoPOy+jje/fsNepA hcuQeGEsIxb6206BYaJ7PSBTqT1FgDzWLkiHuWwGZMAiB9UAAKPbCRiZMeoHUaBp3/TolBTpN SYklNJVFd2rFrjuxlv1Kjt7Yh7Ba/eHXb6n1IuSZgnh+S17Y0SF1YaMCheGSMvUELW0Fxuljq tYogCHXW1JttMteMRkY9nhYJ6DjUVA89hQLcJ+8UutWXU9gC+sdNz0uWR7WtDAldEf8oZaIyT V3boQHLbEohrTxU3YQL7rhiSsvntiyJQpSxYsomvumNimM+3bDrepZ1BGdEPQ5Y5XAW2xt8gr IHjL9w/Pi1KL6U336PXrVZ+CBmZlS1xAJ9o6ytVniBTYJLx9tfp/JUc+vhcIyOrNnlQFMxxVw fPszj7TjhMurE5EVhU6jyhRNqLsFpG9MjQZ6WC98gwb/h40InRp1+FZZ66hrgjn/1b1m4IlKb EDmC1Lj 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: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);