From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752717AbdHNJfJ (ORCPT ); Mon, 14 Aug 2017 05:35:09 -0400 Received: from mout.web.de ([217.72.192.78]:59156 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752634AbdHNJfH (ORCPT ); Mon, 14 Aug 2017 05:35:07 -0400 Subject: [PATCH 1/2] kmemleak: Delete an error message for a failed memory allocation in two functions From: SF Markus Elfring To: linux-mm@kvack.org, Catalin Marinas Cc: LKML , kernel-janitors@vger.kernel.org References: <301bc8c9-d9f6-87be-ce1d-dc614e82b45b@users.sourceforge.net> Message-ID: <986426ab-4ca9-ee56-9712-d06c25a2ed1a@users.sourceforge.net> Date: Mon, 14 Aug 2017 11:35:02 +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: <301bc8c9-d9f6-87be-ce1d-dc614e82b45b@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Language: en-GB Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:ZCZ8aqGt2HSSlUMeKBO4A6qQJztCCX9PJTTzhBoafEEosbL8t/x I6AFBwtZx7bKPn++TRgKdM6HDE4ag1f10WP9DfnwW7fgiw+RzYjr9w56a51lCSUbdoVRboU XNChBolfCGCusMl+fG3rm69oLDyNfnRE8e2VZHZ9qU3RaiRwn3oSmCsCk9W7TC43TXWWXkJ M97MmRtCRASv4R5i8pg2A== X-UI-Out-Filterresults: notjunk:1;V01:K0:pVPjRPaDETo=:O0FEegTIxiFtndB+hyU/CR 20cl4Lp59PxWGhRP/o6tQyAZnlDFUU5VUg/BVpoe8KVY2zddgB3o2eMfKclc7yVyPl+ziWBF0 xFhWmk7ASmOZIgTEGfU3Acj5LwEGNzL4d6cu4uv8IMg3lV96WZqW7UGHTq1jFKJ2k6V7/kF40 oxTuZpcKWiVh1qjzO1I9UTbcu3gEw6xl2pOWoCoDh5Hu6lqQXWD+yoYBm9J9OZmnE/z38thLQ XWxZxXM6xumo4KwhEYOE2GnAKE/sjhCZVUwxGvn7Ydl8UpOWpPVLlmxTMsAYPHpav1wYSlcg/ drYD9JdyRPuCRYDOI2r1fhqfA9S480eaxhHNuuWcRh5TQ62SWJmlzinKMoguRqIRTIv+8GhQQ UqaqT7nuQ70gMj+ub8f2G73vqFazunM7d9XKSrnF2wV3WRllZRPjlI/39NZID7A1g+91DivX2 xpkKwrntR1actL4BP3E+0YzW6KfoIb+4VA82NlRcQppbAX5Wz5h7UxZ/apl/jipAhM4E2roas 6pXqRzAS9TDOUrMzlNkbfRwMDFLuE4LLMSTZhXrk5RhM+gNGSA0fapsN+pX1oRrK5llmpcQ7j TwW/d/h4s0rH/zgct9WhPn2yC+rsf1e8nDsvXCStJvTn1omxPfRU1ZbXnV2lkTV5qoRU6Fxf+ v5W6uDt5HFBQN2N4qk9lvSQftAUg5wwuQu665Gp8qS+VM0MbKFd/1n7fvAqtgxx+G3lBCme8L M+kCuCCTBXZ6ofhRSUdZTAcocZxJix8swAZZ659HwMg7NOqHHLfL9QJ7LLTSihHOWFvrsL/7z qe4rKytu7EmNH5Pt+L/pUzz1WIP86EXAFPezgeVoMkwPASJE+s= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Mon, 14 Aug 2017 10:50:22 +0200 Omit an extra message for a memory allocation failure in these functions. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring --- mm/kmemleak.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 7780cd83a495..c6c798d90b2e 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c @@ -555,7 +555,6 @@ static struct kmemleak_object *create_object(unsigned long ptr, size_t size, object = kmem_cache_alloc(object_cache, gfp_kmemleak_mask(gfp)); if (!object) { - pr_warn("Cannot allocate a kmemleak_object structure\n"); kmemleak_disable(); return NULL; } @@ -775,10 +774,8 @@ static void add_scan_area(unsigned long ptr, size_t size, gfp_t gfp) } area = kmem_cache_alloc(scan_area_cache, gfp_kmemleak_mask(gfp)); - if (!area) { - pr_warn("Cannot allocate a scan area\n"); + if (!area) goto out; - } spin_lock_irqsave(&object->lock, flags); if (size == SIZE_MAX) { -- 2.14.0