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=ham 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 D2928C432C0 for ; Tue, 3 Dec 2019 22:56:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A59BF214AF for ; Tue, 3 Dec 2019 22:56:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413780; bh=940R+45sMDdBrThN1I64ybkEZNw1jFVAXuEA7+0r2W4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KVgonamUJeyS1DNLqfv58nIif6qoQ/5OU1dEnjZDIYJi6nrt6rYKIc5Fd92yHm8m4 zxUEQHjfWrEMljAj7P4JQD57vSUbuCyCc2r7Ha12yIEB0XhjQJqbXdqhO+r7/ueWq3 FH4oYpn4Y/OGZCkeidRq+1WOuJZHEAtGjvzrdDTE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730421AbfLCW4T (ORCPT ); Tue, 3 Dec 2019 17:56:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:51130 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729885AbfLCW4P (ORCPT ); Tue, 3 Dec 2019 17:56:15 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (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 88D5320865; Tue, 3 Dec 2019 22:56:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575413775; bh=940R+45sMDdBrThN1I64ybkEZNw1jFVAXuEA7+0r2W4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aVCtzjgchh6z5Lnhz/GncORmslXUJQ8tYgSIFZ1SZgJZVis0qqYrL07RpqGeM0Skg 9rMxe0JPVRenDEFmVm09CD7QkunuUHCSumNCUY1mqzYqs2ls87YlCHtQsDWSHgAVq4 9ye7tLOBR7xYGj1RvZFtyPU9t2tL0GoBFJ358M38= 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.19 218/321] net/core/neighbour: fix kmemleak minimal reference count for hash tables Date: Tue, 3 Dec 2019 23:34:44 +0100 Message-Id: <20191203223438.461210885@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191203223427.103571230@linuxfoundation.org> References: <20191203223427.103571230@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 4721793babed5..7597afee70680 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -370,7 +370,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