From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753692AbdASQ6D (ORCPT ); Thu, 19 Jan 2017 11:58:03 -0500 Received: from mout.web.de ([212.227.15.4]:56689 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753618AbdASQ6B (ORCPT ); Thu, 19 Jan 2017 11:58:01 -0500 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> Cc: LKML , kernel-janitors@vger.kernel.org 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:qbrsZ5clbrRMxrhvll2NZwW73A5NR+/K8iz5NhGBQj8fEC5dsLV iz7fPet7nfESpOcd8CeJ318jEFdtgjiiK4G5NPHEbFQhUVXzqPZrtmb2VmDAyKGE6gOKwHf hL74fkvGJ1c1/CS7/6mUjxqLHy5MQohFP7Uas/xT2GgF5WEGsYZBtNYMJw6Slq2+jzVozky 395hEeFXhbF4Lm6+MIE3g== X-UI-Out-Filterresults: notjunk:1;V01:K0:OjGF0KHByPo=:x0J+ashml8bFvD+3hsg0C9 3VZwl/CInZP408GVcqzW0oDrXps+7ydbVUS3rS3/u3Y1BN8lNiJmdcrWE6e8LrojqskPi+ukq YrMhGdPVyx/1mokUgywRCel7ZObLKZMe+RNbI63daORiZZgtAuwM1BvXqCO3JOHcPQwrZ9CDP Qfsw9y1ZtRg2JZP1EVQD9V39RaMLyhXEiS2Df51VaRtu/7VY+RXKIGSl3z3QWMUmxU9sHF2r4 /hzDobtMzlMobmWIILotFd/F4wD3+mPAWSX07d1Pej9bPDfmfkHeur4K9oR6WSWgSW9RkTacb HF2IDDxjAXqQ2u5GrKsBEHsKsI5TRZiTDEsyvCmykO8ta9J6EGaypLWKnANH9cCvWN6DSLNjF D4ewu+ABdyJdqazI514jGogVj2UkY4gON7tkVGdDWYzqHBb23cbqHwK/rgHF0cLCkPTyS6lWa gkPRj+1G7gL1V+yidF/gEFJ3TgmTnasBF5rdqmkK+sT9DeVd3TSw6d+cSSMyDoNv2QmolGrJG oeEFkqResJ/h/WOu23JBVjWWLe592z3krJWt97YkCnD/w/ynyBXuwbxu+c+lT7o/rK3NWDqCm cc/3oE9ZUEDoKSmzYWa5u4He1VZLiOkThb9Cszkqmhp3B4msUYuU+FK77ae5A4vfyV67IqCwj B8sG3i40mnwdLMzmCOvT1HjLBd2e7l56CmggykQKzryK9wAtIW+C9q9t4l/BYz20JdKxxQRVI dSZ8WRC6blC/w+3sKKb8hQYqtbvW56sZiCMbNBaFJIlUuj9UADRw2Uoc7MIYSmN2nUZoY/HzX mBY9HRP 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 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); -- 2.11.0