From patchwork Thu Jan 19 16:59:00 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: 717256 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 3v49Yx2m3Tz9sxN for ; Fri, 20 Jan 2017 04:19:33 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v49Yx20pwzDqGV for ; Fri, 20 Jan 2017 04:19:33 +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.3]) (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 3v49Hz374DzDqT8 for ; Fri, 20 Jan 2017 04:07:27 +1100 (AEDT) Received: from [192.168.1.2] ([77.181.224.32]) by smtp.web.de (mrweb002 [213.165.67.108]) with ESMTPSA (Nemesis) id 0M0yvn-1cGasr3LyB-00v4mO; Thu, 19 Jan 2017 17:59:03 +0100 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> 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> X-Provags-ID: V03:K0:daYCUvDl9G6d9I5mGf4PgKH2RazvYHgR5fDgq/HAe5oR9Mw/mlu GaGyh7e+XDzF2pCKOfPfU50+iIN5FC0+/KC1iPvaeGR7PZ7EoGdmEAofGEnz41JKR/Z86K8 KbaWFVkfL699vwCUsqmjHpRrB5D0j2V8mLHU4LWVz+qDedXfjEGSyuUuhhTo21z79iwZkxU 9sqBZW1qEzSVGhJgx476g== X-UI-Out-Filterresults: notjunk:1; V01:K0:zXeuDtgykpY=:7k4+6vGufLEKCOLCaH3dTl 9NfBCLL92W0BZO9EreENroNhYDbM/IK0hfmOH9/erOy7nikdSoTc8ntWSfFVHIX36FyNwrh49 fDkGCmYc+peWSxF/8ZS4cp6s5zwIUdBWxu4xqVJ8bQ4JSPSWBfngVV937Rxc/jbKYl+Nbbd// eLcVUiCLcic/ax+yImsnWEHpmBNSZkj/O+GELj1zx46biOpCUidAAead99H2/Yqn3CDPCuotj MEmqc+DNwROiFrimRl103USSxFDAQ717JejJAfo8w/hJ2tXc2e0LfwFCIZW2NmexdAygqksIl nM5aroAhWkFMPWUUHfBazuNLy3ERKVHIEL7fkFWEcVdeeMkqrZG8xFLOY0PLVxQc1uUC8eg1b TYkDVlTvSwj5o114WV12GvPeAKKuBhgVLEsblBCJ8Ppb6yVqvSlGEVhBA+jZvmzyOTjAIRVsB p856nBHGFspDP6M4t+IsspKe1WhbKw7Zez7KMT6WZFpeB6378E135i0SOFhhbobKdMjTAdS1E OlFkGa6zNhX0fmp8oP/JwskwyDetVMCKJlxjaMgfzdZj0Y5i338TQKuOqEN0Y2zWQA1pdXiHb gn5S5jrIw10tEVw4gM70DQSWQTO2iXgam+HHK7Bvy/LRKGYYmikM4tq2JN4A0kcE1rzyAf11R j00ydCNUZQSCvJWwLF8fCyKQENhjwznDjCiNblEJL2VQAcdt2YtU0HbPUUIA96tKAPeSbcM6h kdquIVFDupy9hKAxhinrLD5rSUOqQOFvLBFblbEPysgydVxCg1ajeYht42D9GxYu7/8aOYXPy 9293JDO 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: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)