From patchwork Thu Jan 19 16:55:32 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: 717242 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 3v49Mr2hzYz9ssP for ; Fri, 20 Jan 2017 04:10:48 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3v49Mr1VTMzDqWS for ; Fri, 20 Jan 2017 04:10:48 +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 3v499S2ssdzDqSW for ; Fri, 20 Jan 2017 04:01:48 +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 0LtkCj-1cMaQ01P6L-011E7z; Thu, 19 Jan 2017 17:55:37 +0100 Subject: [PATCH 2/8] powerpc/nvram: Return directly after a failed kmalloc() 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: Date: Thu, 19 Jan 2017 17:55:32 +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:syOgvzI+rsz7mME53kWFwyyO3I4niaoDksmZ+OtwikdQUq5OTxm 6m9WELAso/vz8RDfFbvTP18NwP3sDoVhS1KvqaNd0C6/gYipoRF8Ozc3UW0xcxSQR6CiLGz KfJPj3OO8oVK6hG3g/pjJH2mESMGST/naPzy1z4gjIahDOu/0y7MIDR2xT0Y8c5AZYl9vJx Sm1eeykk1WPGNl6+YHa+g== X-UI-Out-Filterresults: notjunk:1; V01:K0:lUjacxd8w0E=:GK1caiofNni8VXvkcWFCuR LneiMy6g4rGVyLcXc1HlPkxiFjPiu2DQeu1gien8T97qUynQKqSt9RbjKi3y1j45PTA1eC03H kdcYxUh30b74XGG8PLWVB4zoy3ywZAOuqLA/BsCb1ZkIV3Qjk5t8NDtp0iWWT2Wp7QlXKWWq/ JKNiSLsFcI2zhh0jfp5f1GgC2C2UupkGHe/6sBIbloAmrQst5vM2XVG77hundG0e6Tc/nRfAc zxDzrzDQah91BEoCbrbN6HXAFQZlkfomkbSTJLZIeLE0cqyvBhswYZl4JqlNRNz4VgM62RDPW B33IKtZrwGckXvi5jEsM1h1HcSRAxSncwXJYofYFut3VB1FeQdz98/qH4Q864l8jo9zjT4rwS rE9nlthhT3qismUUkwJzkyQ7aHrDK0QzKmc1pnEOhTBZiIu5s+ciQDw6/PLco58f3wiaY8uV9 jbZlzjiKfPAKU3FLeNvETYrxOlzm4gSVhQ55Kfqmdp9UjK1pJW0JU4HnYpRsIsuIMHG1ghuaf BqGuV3SJWS4IYmkOSp6NuZclxtPf6GlypLnU0MKWjCA3UuGDIE1wJSVsDyxe0CsBreiT+fdyM hMPf0I2s4F54C/oP22iM3D8U/jIrxpOcd3HqE/BGh+AWnXpDt43YoLpYSBvNIgTX6w7QIeF72 eaJFsio2Ym+/VjC2PVUljVlmGt/Z4Tm0NvnWAVlDc/9wytYuzBUiYbRTeEIAVOg1zfdaPQ6aQ hMw3eF4SM1ec89cklvm37LFFsQcVjoMs1DezyPZ315pWGIdHdrga1UB6EIxnw/a07Xg7tAx9g QraU1rP 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:44:03 +0100 Return directly after a call of the function "kmalloc" failed here. Signed-off-by: Markus Elfring --- arch/powerpc/kernel/nvram_64.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/arch/powerpc/kernel/nvram_64.c b/arch/powerpc/kernel/nvram_64.c index 37d08b95c3f0..cf839adf3aa7 100644 --- a/arch/powerpc/kernel/nvram_64.c +++ b/arch/powerpc/kernel/nvram_64.c @@ -802,11 +802,9 @@ static ssize_t dev_nvram_write(struct file *file, const char __user *buf, count = min_t(size_t, count, size - *ppos); count = min(count, PAGE_SIZE); - - ret = -ENOMEM; tmp = kmalloc(count, GFP_KERNEL); if (!tmp) - goto out; + return -ENOMEM; ret = -EFAULT; if (copy_from_user(tmp, buf, count))