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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 5D413C43215 for ; Fri, 22 Nov 2019 06:04:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2CC7F2068E for ; Fri, 22 Nov 2019 06:04:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402665; bh=m6/UddO3uVeswlhu7e7/QS+bGiHCMuf33iWbMXmEGOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LkTyV2NsEZ/H8ACzpFtklkdCSaCH2jjE9wfn+APaec/Fo6LBhmtBw0JCO20J3wWLt fBFqFGRxPaMLSkDwLWVdo7IlLfnmff0A7MglqkgZlsaGr3cPC7Emskhv4c6la0kjzs Ha7f4IfzYS6NXCs/WnpruMcdIc6d8ITf1q1tw5dw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728748AbfKVGEX (ORCPT ); Fri, 22 Nov 2019 01:04:23 -0500 Received: from mail.kernel.org ([198.145.29.99]:41844 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728752AbfKVGCz (ORCPT ); Fri, 22 Nov 2019 01:02:55 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9937F20714; Fri, 22 Nov 2019 06:02:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1574402575; bh=m6/UddO3uVeswlhu7e7/QS+bGiHCMuf33iWbMXmEGOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iNRwO/SaFtMG/5QzyiSV0O2161sVdC1NH6gAk4s4h/e1XmxC7ksILrCLjbJH9AF/x mj2gNrjKC99BPU52cbyAizDOCaD5muXztVEU+sqavzZ3UVHkhZRQadHBWCX0+Eai+y P5b7DBeiHFASjq1f3V9NXbTf/UDyTqkk7mWb9L9M= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Konstantin Khlebnikov , Cong Wang , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 77/91] net/core/neighbour: fix kmemleak minimal reference count for hash tables Date: Fri, 22 Nov 2019 01:01:15 -0500 Message-Id: <20191122060129.4239-76-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191122060129.4239-1-sashal@kernel.org> References: <20191122060129.4239-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore 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 1e2b0c258aa88..44a29be7bfff3 100644 --- a/net/core/neighbour.c +++ b/net/core/neighbour.c @@ -332,7 +332,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