From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751228AbdASUoS (ORCPT ); Thu, 19 Jan 2017 15:44:18 -0500 Received: from mout.web.de ([212.227.15.3]:49326 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751069AbdASUmY (ORCPT ); Thu, 19 Jan 2017 15:42:24 -0500 Subject: [PATCH 5/8] powerpc/nvram: Return directly after a failed kmalloc() 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: <60b730d9-c683-a6ee-42fb-1c874ad86205@users.sourceforge.net> Date: Thu, 19 Jan 2017 17:59:00 +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:daYCUvDl9G6d9I5mGf4PgKH2RazvYHgR5fDgq/HAe5oR9Mw/mlu GaGyh7e+XDzF2pCKOfPfU50+iIN5FC0+/KC1iPvaeGR7PZ7EoGdmEAofGEnz41JKR/Z86K8 KbaWFVkfL699vwCUsqmjHpRrB5D0j2V8mLHU4LWVz+qDedXfjEGSyuUuhhTo21z79iwZkxU 9sqBZW1qEzSVGhJgx476g== X-UI-Out-Filterresults: notjunk:1;V01:K0:SwbGHv0lxLA=:Tyh+N3YBSq7gXTp7AjoNJk +PA3Mk1Aj47gvH0aNU5/GrlPPZr9DeXOpMvyoDau7PZ6Lm89d/BiBQIoYCtE4HffuU2OE/bj/ kQL8li1Smo4Hf7oy3tffUzuJEnCkVHnAOSYQCkfSRtaI4+kQcpchyUMbxGnJ5IsaOsNbV54Ey kc76hkIkdMd7rguT08LpmlbDgdXPIMv0CO8+wRsyI6i9MM6VbEDo4uXgdn2rM7n+HpEYGJ8je cautfvmS5vfrSo2WE3NyA0aiN6ztSYqkwiCdVlW4wINjaxW+bLlxDPMFKkH8L0E1ttZUJUkFw wfH5Xq1BkGt8TfIiJW3Q1t8NSgDBW9qTYaq5i8f29PPpMimUDajkeO9Jth8gYtY+UMr03SpsB 3xVigdJR2lsUnudZRPtUqJu0K+E57/cn79+t1+zR5rqKJcRj3dBCOOJY+nznPNG3DePX9EmhK 667+ex7EmKYPn9YaSj4SgxbQOM74BJu1zbSlTFWlU00GvxZrmuZFGyGfxtfkgm7tf0Ryrj0/6 FjsrLi9d09X/X60jPy0LQUN3WjmHqiqsu1JetWPmBwc1iJEYr1dvJXXKC0HyYLxfsl+X1a/EO nq0+iqUqaDJ4JMEBJccbwgeUCZB9iBf3udra55fTbdmsUAJgZbkNI75xts4RaeFBrjk4FMQRi ediOqwT4/4QzYxEPG2c2PCkBfsFsJeR7ZtTfpegVri3rCkpUJQGQBrIhVmVKwvkn/Rnv12fR4 4Aa6m+nxxR13zMXriYhONYoeGlb8oeC7p6uz5LcaxkcEaPTvFFwdPi+jep1+lUER9F4w41e3r TKYy6WY 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:50:31 +0100 Return directly after a call of the function "kmalloc" failed here. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/nvram_64.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index 463551589b97..68b970bcf2fc 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -762,10 +762,8 @@ static ssize_t dev_nvram_read(struct file *file, char __user *buf, count = min(count, PAGE_SIZE); tmp = kmalloc(count, GFP_KERNEL); - if (!tmp) { - ret = -ENOMEM; - goto out; - } + if (!tmp) + return -ENOMEM; ret = ppc_md.nvram_read(tmp, count, ppos); if (ret <= 0) -- 2.11.0