From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 369A3C43603 for ; Wed, 4 Dec 2019 18:06:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E32682081B for ; Wed, 4 Dec 2019 18:06:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482784; bh=gsezTrwdiq3nD9JRIcpdArOxVKjnR8lRYMoWPJV6N7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nOGIzqmXqC8vceiqC3ceH/VbW7INE9MQAZT9njJ5VqmADjg0fSoj+iDedMk56eBYO 8UAVFyeIKUs10EqT3KG2a5AiXzdHnSHP78PCsEmzFb7bLLN/CPG023bjWDsb81WeM7 t/1un0KBj4ZIl3/ygtT8mYYHx+/Xo06cnKlEGWKY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729966AbfLDSGX (ORCPT ); Wed, 4 Dec 2019 13:06:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:54460 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729540AbfLDSGU (ORCPT ); Wed, 4 Dec 2019 13:06:20 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C5D352081B; Wed, 4 Dec 2019 18:06:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482780; bh=gsezTrwdiq3nD9JRIcpdArOxVKjnR8lRYMoWPJV6N7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zGOz9UalFvhyLLmAdCQnbbVTrYKNB0NQKN0lj8zvqX1i3Yn1xuKX2ELI/UFi6Voci XQNTp8PDZldeI9TQbelGLETnGtkn/4jinIWZbloT4ZLEYhUiUdl96Aw8U0iFLK3EW7 zI6ygNMtn3RqXT7X2Ug9TP5Z15qto7Wwv5kfixU4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Konstantin Khlebnikov , Cong Wang , "David S. Miller" , Sasha Levin Subject: [PATCH 4.14 130/209] net/core/neighbour: fix kmemleak minimal reference count for hash tables Date: Wed, 4 Dec 2019 18:55:42 +0100 Message-Id: <20191204175332.089424655@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Konstantin Khlebnikov [ Upstream commit 01b833ab44c9e484060aad72267fc7e71beb559b ] This should be 1 for normal allocations, 0 disables leak reporting. Signed-off-by: Konstantin Khlebnikov Reported-by: Cong Wang Fixes: 85704cb8dcfd ("net/core/neighbour: tell kmemleak about hash tables") Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/core/neighbour.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/core/neighbour.c b/net/core/neighbour.c index 9a28a21a51f05..2664ad58e5c01 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -368,7 +368,7 @@ static struct neigh_hash_table *neigh_hash_alloc(unsigned int shift) buckets = (struct neighbour __rcu **) __get_free_pages(GFP_ATOMIC | __GFP_ZERO, get_order(size)); - kmemleak_alloc(buckets, size, 0, GFP_ATOMIC); + kmemleak_alloc(buckets, size, 1, GFP_ATOMIC); } if (!buckets) { kfree(ret); -- 2.20.1