From patchwork Thu Jan 19 16:57:37 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: 717243 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3v49Q6417Pz9ssP for ; Fri, 20 Jan 2017 04:12:46 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v49Q62vTgzDqZD for ; Fri, 20 Jan 2017 04:12:46 +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.14]) (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 3v49CZ6KsRzDqWX for ; Fri, 20 Jan 2017 04:03:38 +1100 (AEDT) Received: from [192.168.1.2] ([77.181.224.32]) by smtp.web.de (mrweb004 [213.165.67.108]) with ESMTPSA (Nemesis) id 0LmQS2-1bvTVe1rqU-00ZtTV; Thu, 19 Jan 2017 17:57:40 +0100 Subject: [PATCH 4/8] powerpc/nvram: Return directly after a failed parameter validation in dev_nvram_read() 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:57:37 +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:qbrsZ5clbrRMxrhvll2NZwW73A5NR+/K8iz5NhGBQj8fEC5dsLV iz7fPet7nfESpOcd8CeJ318jEFdtgjiiK4G5NPHEbFQhUVXzqPZrtmb2VmDAyKGE6gOKwHf hL74fkvGJ1c1/CS7/6mUjxqLHy5MQohFP7Uas/xT2GgF5WEGsYZBtNYMJw6Slq2+jzVozky 395hEeFXhbF4Lm6+MIE3g== X-UI-Out-Filterresults: notjunk:1; V01:K0:NTbNMPQuUhs=:Xst007f4cJ6Iapdx2tQWU/ VnrzSeRywdkRSHqgH8zHqQH7WISO9a3XYI6EOS92VihN9XdcJoLZ2WMKZnJTlQv8j8mhn4SDQ Zs0jWzMj/ziFRr35ZiRpJyN+/PXxiW6QyxnUdvJNLPI8KUcJIZimxDUskbLp3yidljz7kJIad EEx4GWLM2z/zh3zbavQOgl9SyiunEBJ0T/4HP2yGfns/wDymeEMPwZs11G1oWVxKxtuKUj1sG AKRBnhqgBbk4IX2+qOV7m54TTWiCFJ23Q7vvdEz4XSNEgEhi4h+50/+zyuyyNORPFwXFFqbWp LZyBtxLNV5kIsVZriP1c+YE6fq88Vcy97YpNZF9siLwyw3/KbTFJv0dKHAhtl5ZJBhwelnfyO TCYeG/iz3Q6/r4wBOrAWRl4dNXKONak72fOVjjSnXWmKk1ktWDiphJ6MD0/YndaDcKDrnvHN0 HBIeN47hfS0j3hy1x2Rf4DSI/yZfhmupkEuqDm9/6VtbzAkoLTEawG85J0WwYvG07qoPpdEVT rHt1OZ0gUiuIVwZ0tGn7eONwaP36GFIUrvc2K6pJplHp5vG1JqWQNqbi7VysPMXJixVQ+mAJI QfW7nHj/xdRLkUBr8E8l0NEgmPm/l1RH7nw1PlUi4SuB5sYtVsi7mgw37a0UyvYK403xcZGC1 BpjTTxb1EVmtlHWXhWC9wZbqOBr/tUol0cPJ4qHtNjy6hkDQQPZiQcAA4VkdZMqLCOp5k5dnA g57eezcmV5v5mEydyPdZat8oLjlaDgwf6vRt6AnlFQTVmDiqbWGRqLU27CHxCr7OUavb/Eaqg y15LAhG 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 16:12:48 +0100 * Return directly after an inappropriate input parameter was detected. * Delete an initialisation for the variable "tmp" at the beginning which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/nvram_64.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index dc90a0e9ad65..463551589b97 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -745,24 +745,18 @@ static ssize_t dev_nvram_read(struct file *file, char __user *buf, size_t count, loff_t *ppos) { ssize_t ret; - char *tmp = NULL; + char *tmp; ssize_t size; - if (!ppc_md.nvram_size) { - ret = -ENODEV; - goto out; - } + if (!ppc_md.nvram_size) + return -ENODEV; size = ppc_md.nvram_size(); - if (size < 0) { - ret = size; - goto out; - } + if (size < 0) + return size; - if (*ppos >= size) { - ret = 0; - goto out; - } + if (*ppos >= size) + return 0; count = min_t(size_t, count, size - *ppos); count = min(count, PAGE_SIZE);