From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753176AbdJGRtG (ORCPT ); Sat, 7 Oct 2017 13:49:06 -0400 Received: from mout.web.de ([212.227.17.11]:59974 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751328AbdJGRtF (ORCPT ); Sat, 7 Oct 2017 13:49:05 -0400 Subject: [PATCH 1/2] lib/test: Delete five error messages for a failed memory allocation From: SF Markus Elfring To: iommu@lists.linux-foundation.org, kasan-dev@googlegroups.com, Alexander Potapenko , Andrew Morton , Andrey Ryabinin , Andy Shevchenko , Christoph Hellwig , Daniel Mentz , Dmitry Vyukov , Geert Uytterhoeven , Lars Ellenberg , "Luis R. Rodriguez" , Marek Szyprowski , Mathieu Desnoyers , Philipp Reisner , Robin Murphy , Will Deacon Cc: LKML , kernel-janitors@vger.kernel.org References: <9a81d82d-fb1b-38d3-1dbf-31e6bf4ff677@users.sourceforge.net> Message-ID: <410a4c5a-4ee0-6fcc-969c-103d8e496b78@users.sourceforge.net> Date: Sat, 7 Oct 2017 19:48:37 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 In-Reply-To: <9a81d82d-fb1b-38d3-1dbf-31e6bf4ff677@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:1vD2NzAanTfCZHBvPkZWJ0+lNTPOPqrgWIizrybchxO6B3Tc5mv eoGW+8RZjWpyi/Zci+JhvQjb1hrOMD93vKRn32tXtjTf4GaReIN86LliYJF5ERZ4LHCAFLO CHkHdJep/f4PIzbsu/kpcjEyfGb11+5OBkQ/4r623zc+jPoiwmrPln2jgmaa4++fheCbZEa J3ziTI1vc/WajdVHuCnDw== X-UI-Out-Filterresults: notjunk:1;V01:K0:4Jx2Eq5Hurg=:BZrlJ97TyuzS+vVZSG1ddS ns/bKf/OQ4lUizA99eEeQV38e9hdunkLjkboxDo1dzVPYMF0HVTwm1Ocjjxt9Dedf1tV5IYl7 Ezsrd+TXYirjvbnwZ0Uhlr/dn25a0lvhbz8DlkMWbm14LCWN/iYwO0o+nh7njFuN7hFOly8ez k0AYbqAH9r7+D8uniC7xezeEbGDZGgClhk/OHgTED4Vxl0wsDOkn1LlAsNYyQ5zLzsDNuYi2a 2UjYk+AVFo0ql3pBFg2xV6oeS2zBiNjR9hbbHWKsL9+LK3iFosDzo7ES5uUNskYEKU5MEzNth fpiKuA6E3DkK8g3/hybNgEv8U2TAbCRe40mFeOuruF6In0iA5tzt2aCPJQEFAr6f2jzgoz4j7 v6oJdBYcXBpwub0Th2yeKS6NGXngXCo6Jf+XHL/vo14yOomkNbOiO7J9DM/rGCu9GeaWw4lgA mxXNBIQOu51ScxE5wOh7PYQJ3/h6Hqli2R4LySmAURKkm0kO4y8xEhCxurZXjP7tD69dbwJFn WPvAwiDLjU0vCi4AdiPCujrwkpX7R8tKPDwRlQYbi3b4RtXJaFY11sXRPnNKQRKoXInoeVw9a +PtsaRJlO3HXxmSWGFic0YBB6fnm3LU7MLsn+qey99OQuMwW02q8lGDY1WKrTDl9/FhbZ5puz eT5LCDBxPpK8O9jkSXSmd4GXxUE3aZTJUvNClYp93rpyKgyy5KvCKJCgg9tHOlDOwrkQYg9Pk bFKSLfitf3alTRcFG9Vn0fz6NMh1Oq7Ik85D+WzOVG2V+VddaqJwYkuKUje6ExsEXD9E3FY4r tlo6Q5st9in5TE359l9uP8v1pAoYkCmdBkWO8qDm0doIg8JZx0= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Sat, 7 Oct 2017 17:34:23 +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 --- lib/test_kasan.c | 5 ++--- lib/test_kmod.c | 8 ++------ lib/test_list_sort.c | 9 +++------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index a25c9763fce1..ef1a3ac1397e 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -353,10 +353,9 @@ static noinline void __init memcg_accounted_kmem_cache(void) */ for (i = 0; i < 5; i++) { p = kmem_cache_alloc(cache, GFP_KERNEL); - if (!p) { - pr_err("Allocation failed\n"); + if (!p) goto free_cache; - } + kmem_cache_free(cache, p); msleep(100); } diff --git a/lib/test_kmod.c b/lib/test_kmod.c index fba78d25e825..337f408b4de6 100644 --- a/lib/test_kmod.c +++ b/lib/test_kmod.c @@ -783,10 +783,8 @@ static int kmod_config_sync_info(struct kmod_test_device *test_dev) free_test_dev_info(test_dev); test_dev->info = vzalloc(config->num_threads * sizeof(struct kmod_test_device_info)); - if (!test_dev->info) { - dev_err(test_dev->dev, "Cannot alloc test_dev info\n"); + if (!test_dev->info) return -ENOMEM; - } return 0; } @@ -1089,10 +1087,8 @@ static struct kmod_test_device *alloc_test_dev_kmod(int idx) struct miscdevice *misc_dev; test_dev = vzalloc(sizeof(struct kmod_test_device)); - if (!test_dev) { - pr_err("Cannot alloc test_dev\n"); + if (!test_dev) goto err_out; - } mutex_init(&test_dev->config_mutex); mutex_init(&test_dev->trigger_mutex); diff --git a/lib/test_list_sort.c b/lib/test_list_sort.c index 28e817387b04..5474f3f3e41d 100644 --- a/lib/test_list_sort.c +++ b/lib/test_list_sort.c @@ -76,17 +76,14 @@ static int __init list_sort_test(void) pr_debug("start testing list_sort()\n"); elts = kcalloc(TEST_LIST_LEN, sizeof(*elts), GFP_KERNEL); - if (!elts) { - pr_err("error: cannot allocate memory\n"); + if (!elts) return err; - } for (i = 0; i < TEST_LIST_LEN; i++) { el = kmalloc(sizeof(*el), GFP_KERNEL); - if (!el) { - pr_err("error: cannot allocate memory\n"); + if (!el) goto exit; - } + /* force some equivalencies */ el->value = prandom_u32() % (TEST_LIST_LEN / 3); el->serial = i; -- 2.14.2 From mboxrd@z Thu Jan 1 00:00:00 1970 From: SF Markus Elfring Date: Sat, 07 Oct 2017 17:48:37 +0000 Subject: [PATCH 1/2] lib/test: Delete five error messages for a failed memory allocation Message-Id: <410a4c5a-4ee0-6fcc-969c-103d8e496b78@users.sourceforge.net> List-Id: References: <9a81d82d-fb1b-38d3-1dbf-31e6bf4ff677@users.sourceforge.net> In-Reply-To: <9a81d82d-fb1b-38d3-1dbf-31e6bf4ff677@users.sourceforge.net> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: iommu@lists.linux-foundation.org, kasan-dev@googlegroups.com, Alexander Potapenko , Andrew Morton , Andrey Ryabinin , Andy Shevchenko , Christoph Hellwig , Daniel Mentz , Dmitry Vyukov , Geert Uytterhoeven , Lars Ellenberg , "Luis R. Rodriguez" , Marek Szyprowski , Mathieu Desnoyers , Philipp Reisner , Robin Murphy , Will Deacon Cc: LKML , kernel-janitors@vger.kernel.org From: Markus Elfring Date: Sat, 7 Oct 2017 17:34:23 +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 --- lib/test_kasan.c | 5 ++--- lib/test_kmod.c | 8 ++------ lib/test_list_sort.c | 9 +++------ 3 files changed, 7 insertions(+), 15 deletions(-) diff --git a/lib/test_kasan.c b/lib/test_kasan.c index a25c9763fce1..ef1a3ac1397e 100644 --- a/lib/test_kasan.c +++ b/lib/test_kasan.c @@ -353,10 +353,9 @@ static noinline void __init memcg_accounted_kmem_cache(void) */ for (i = 0; i < 5; i++) { p = kmem_cache_alloc(cache, GFP_KERNEL); - if (!p) { - pr_err("Allocation failed\n"); + if (!p) goto free_cache; - } + kmem_cache_free(cache, p); msleep(100); } diff --git a/lib/test_kmod.c b/lib/test_kmod.c index fba78d25e825..337f408b4de6 100644 --- a/lib/test_kmod.c +++ b/lib/test_kmod.c @@ -783,10 +783,8 @@ static int kmod_config_sync_info(struct kmod_test_device *test_dev) free_test_dev_info(test_dev); test_dev->info = vzalloc(config->num_threads * sizeof(struct kmod_test_device_info)); - if (!test_dev->info) { - dev_err(test_dev->dev, "Cannot alloc test_dev info\n"); + if (!test_dev->info) return -ENOMEM; - } return 0; } @@ -1089,10 +1087,8 @@ static struct kmod_test_device *alloc_test_dev_kmod(int idx) struct miscdevice *misc_dev; test_dev = vzalloc(sizeof(struct kmod_test_device)); - if (!test_dev) { - pr_err("Cannot alloc test_dev\n"); + if (!test_dev) goto err_out; - } mutex_init(&test_dev->config_mutex); mutex_init(&test_dev->trigger_mutex); diff --git a/lib/test_list_sort.c b/lib/test_list_sort.c index 28e817387b04..5474f3f3e41d 100644 --- a/lib/test_list_sort.c +++ b/lib/test_list_sort.c @@ -76,17 +76,14 @@ static int __init list_sort_test(void) pr_debug("start testing list_sort()\n"); elts = kcalloc(TEST_LIST_LEN, sizeof(*elts), GFP_KERNEL); - if (!elts) { - pr_err("error: cannot allocate memory\n"); + if (!elts) return err; - } for (i = 0; i < TEST_LIST_LEN; i++) { el = kmalloc(sizeof(*el), GFP_KERNEL); - if (!el) { - pr_err("error: cannot allocate memory\n"); + if (!el) goto exit; - } + /* force some equivalencies */ el->value = prandom_u32() % (TEST_LIST_LEN / 3); el->serial = i; -- 2.14.2