From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752569AbdHPTVg (ORCPT ); Wed, 16 Aug 2017 15:21:36 -0400 Received: from mout.web.de ([212.227.17.12]:52663 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752358AbdHPTVe (ORCPT ); Wed, 16 Aug 2017 15:21:34 -0400 Subject: [PATCH 1/3] pstore: Delete six error messages for a failed memory allocation From: SF Markus Elfring To: Anton Vorontsov , Colin Cross , Kees Cook , Tony Luck , kernel-janitors@vger.kernel.org Cc: LKML References: <97737d95-d6aa-d24f-1af0-9d4895ceaed2@users.sourceforge.net> Message-ID: Date: Wed, 16 Aug 2017 21:21:27 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <97737d95-d6aa-d24f-1af0-9d4895ceaed2@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:0q3Km1G+C0GWa/bZUDcYRr0M/UlJ38ryXjdYxHwoCelHZkBkO/w 66oEwshrkExh2aYjKbhz3Ki+tAc7NZIEpYViZCsG8cuR9lz5fvR+dW8j0MXfxaF3Ho4Zzei HnhAb8XMi8352sVnCgzq94VEtJI+25J8OosGqMcpOsjdDq3xGAXN9CGbDO41615nnHaeCX6 0yzk/gVC7NvInpk9YeweQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:jUawhHdvpFA=:nkWr3TGZfOIKCngSEuPk5X diRfMQhI+rGUM/FBkiJAH7NKy3G7TrQXT9aNJm70OqGUy1N5zfr/PWgdYYHO7sEJO7u1Muv1X 9GVVt/KUCvwQNear/g6yEJ3VNAdsBNBOVXxsc20WtoZardqBojKCzit71BlCYAsWvVPxaBfMf usOxi8vtz7IYIuQ1aoypOdhcX9y8KRK7Ax0rk090fvUJMTo6FsyqTev3XybO95I/T4s0eASWK cBTnWx81buZMtTFwbjiTGAIJu8dJF7V4RVPhjrDf55Mfwk78VVSNFI78He7NOeypK9ZZiGlEl UX5gzCrTBy9+K8wxwTqEfc/2bEQtFVsKJjFyZKZk85jfEQvZ20Chz6tV8lwF8SpkQcFJAp+qi 2qyI8rtGGjIlR9QSBhHTK5iT95yHxr+7kgwKZGnnmXNaKHPdG+6hYTzMOUQIyEMjiymvlaR/8 SvTkCeW8oX43OSIok0i/UqaE59LoZBhQwRNe7BrLSN0WdYzQ13lxkmC9wuRyEkdAldAH+tmAy T99CeGe+pldrnosRf8PINcAQ4E7C5fZ3m4lNtpSpxLHb9rmmuSaQgN4FgdXi+CT+VQbO1bpqF XlG8VDsd12ZufgVFmDH3kcCzkzpp7FHzdVgSQnZRGuv2mWnuva+ESxnY4IX0XkLQ7PQgTbUi+ 55A0KBgT4pTbYKD4V6L1t+OG9S1yi6bGK2M5SJXztdTTNPBKUnZ1Zhbfm9LriL/dci2aQe0i0 iGDGQeGzd75LyUAMmavbHPtg2rT34e5oLIMwrsK7bl4JOJnfiCZDUnsSOPMQ6A0wVSnthVcaU OryWfFZU66wQs6KeaOCEg7nXgRON4VTrGUVEm2L71o+5xKBV3Y= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Wed, 16 Aug 2017 20:30:44 +0200 Omit extra messages for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- fs/pstore/ram.c | 6 +----- fs/pstore/ram_core.c | 15 ++++----------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/fs/pstore/ram.c b/fs/pstore/ram.c index 7125b398d312..42d27e5fac9f 100644 --- a/fs/pstore/ram.c +++ b/fs/pstore/ram.c @@ -719,7 +719,6 @@ static int ramoops_probe(struct platform_device *pdev) if (dev_of_node(dev) && !pdata) { pdata = devm_kzalloc(&pdev->dev, sizeof(*pdata), GFP_KERNEL); if (!pdata) { - pr_err("cannot allocate platform data buffer\n"); err = -ENOMEM; goto fail_out; } @@ -814,7 +813,6 @@ static int ramoops_probe(struct platform_device *pdev) cxt->pstore.bufsize = max(cxt->record_size, cxt->pstore.bufsize); cxt->pstore.buf = kmalloc(cxt->pstore.bufsize, GFP_KERNEL); if (!cxt->pstore.buf) { - pr_err("cannot allocate pstore buffer\n"); err = -ENOMEM; goto fail_clear; } @@ -904,10 +902,8 @@ static void ramoops_register_dummy(void) pr_info("using module parameters\n"); dummy_data = kzalloc(sizeof(*dummy_data), GFP_KERNEL); - if (!dummy_data) { - pr_info("could not allocate pdata\n"); + if (!dummy_data) return; - } dummy_data->mem_size = mem_size; dummy_data->mem_address = mem_address; diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index e11672aa4575..fafa8af1289c 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -292,10 +292,8 @@ void persistent_ram_save_old(struct persistent_ram_zone *prz) if (!prz->old_log) { persistent_ram_ecc_old(prz); prz->old_log = kmalloc(size, GFP_KERNEL); - } - if (!prz->old_log) { - pr_err("failed to allocate buffer\n"); - return; + if (!prz->old_log) + return; } prz->old_log_size = size; @@ -411,8 +409,5 @@ static void *persistent_ram_vmap(phys_addr_t start, size_t size, - if (!pages) { - pr_err("%s: Failed to allocate array for %u pages\n", - __func__, page_count); + if (!pages) return NULL; - } for (i = 0; i < page_count; i++) { phys_addr_t addr = page_start + i * PAGE_SIZE; @@ -529,7 +524,5 @@ struct persistent_ram_zone *persistent_ram_new(phys_addr_t start, size_t size, - if (!prz) { - pr_err("failed to allocate persistent ram zone\n"); + if (!prz) goto err; - } /* Initialize general buffer state. */ raw_spin_lock_init(&prz->buffer_lock); -- 2.14.0