From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754075AbdASQz7 (ORCPT ); Thu, 19 Jan 2017 11:55:59 -0500 Received: from mout.web.de ([212.227.15.4]:55530 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753464AbdASQz5 (ORCPT ); Thu, 19 Jan 2017 11:55:57 -0500 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> Cc: LKML , kernel-janitors@vger.kernel.org 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> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit 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:AurNfJhInew=:DkNTVeh59alFhhrdfHtOJe SCN9p7MeWzCRBErLqgF7aVd4YJwcNA2cAI0EyJR671R+Un15r70YBwrj51KoYdR/9ZIKXZc3f m8TSb/Am46QppgMfHuW5P1Ao37GValUosCONk65wUURIikrJXX05lwweKRdFnylS+2QDM8zaS y/KMqd9HJ0Xq2UukPcPY3ED/WjdJU/Yk33NF6SMcFchoBxiDZFHXnfgq6p6LP9sSlW8jiCN/7 75GcRrZpHIZk7dBf+hbzz+/Y11NXhkbr7jYF0gUA77A6qyRo6+QC6Stbo4IrnLW6gRIp30zV6 gXmXTQPlf1yiJShfXHbAvxRDx/AkqL5LnKLyuKMJZtHLiDZLBw+CFVcyVf5IaqpawtNXBQgrq BPK4qAu5/qjQ22Mh8GyW1+tHMvW59DNZ+0u2yguMt3ReTdXxegmSaeY7U6rTNrE+t3SLPDEya 1Lfq53uJciNrS1zoxpYUqoCjxGWfWbr3ah6O847GaeV3kTMTkeMrwrPW6fTKC2taIFcKjdlvu 8W2e154t3HKMcUrNftfxWvWe0Nmk3ZN6iJd2hsIBm15g3PvM/Six8qJlWGHABYyBm0MQkIuDV s84QjS2d5M4uS5PdacJzWQiQ/rE4UElr6vCIz234sT9e1B2D11dS5vi7ZehjgEGduVpUuIad6 PrbukAgOvK+WW/jnz/MgoXKgAfNnICH5IWJktxXKT0B38V2F/i96WQhcHhXXS8CzZvZQ1rSyl GWQd4uFqrlsqijzWULUy89MOvFKQbe5yjjx2eUiidmCVjCU2uddsJSoVJsYpO60O8HPpjz9JH ppGEKPO 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 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)) -- 2.11.0