Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp819829ybl; Wed, 4 Dec 2019 11:24:24 -0800 (PST) X-Google-Smtp-Source: APXvYqwmEhB+hf4O/fMCqKeRfrkEP5TLo1YyOIGv+rqYvIoJxIy0fm2Hpqqfm91O1KgNVeMawLVH X-Received: by 2002:a9d:7a88:: with SMTP id l8mr3960734otn.187.1575487464035; Wed, 04 Dec 2019 11:24:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575487464; cv=none; d=google.com; s=arc-20160816; b=vad4l9fk7xBucP5FKxJQC9JM4byHCBy4KR1ddZshadU1xdPOsCcL7CImKoPsB72TBk mSt78lR4QwSs/vcQ5iCDHiTPo1SqzyJYEV5WHdOmD7POXNokU9mxbidXNXX+VahjTSBo 2YtH9HSj21Hc8u2e81Gal4KSAmnHg9LA6n13dfyDyFS/pwg5ge24sZ9Ju5+Jk8ltcrgt xD5u3kt3o9YKsscE/fJY21dSjK7eKmp10L3K3L5zNsgzO7u+/pwTy57XZVZ2WE0/hhmA t1mv3WNdN35CGG3NaGV/WVR5waQ5Wa9WtKSVGiOO0YAEK75FUB8f8ZKftN/jIlg4pyNi 0+7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=xYE+rBDZKQFnPsPuV9I4XNYXOtY8cUP7grrBrY1XITU=; b=NJp3xMH2oCvVDIclctvIqt4qpDcqnsAnbABRDQE2vczG+OCHLWh9krZGPp4TIFnuuI 3b7Ad00ltOXmQS6Pc58LhQXQ0rt7Xx24JDDRzl7YA6bwHUdqllsI6PY1BgJR9AsOmLBG iOcSpLhoF+aoacdi3S8Jkb1wvcCRqqY9PoPUaYqn4ozouW3udBNcu7pwOIkHFZ2JtdK0 urZQA34EvZEwBVwIjh9VE2QC05t4Kxki1+WwhL2Q/AlGSVysDHstpU2S4ddT6QOPrev2 D6MjfChpD6SaYqARrNH2vKiM2BuuMu4ZoO38QxCtxB91dKXsCFuaxcK244VCxHVO1f2F iNaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zGOz9Ual; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si785308otq.217.2019.12.04.11.24.11; Wed, 04 Dec 2019 11:24:24 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zGOz9Ual; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730533AbfLDSGW (ORCPT + 99 others); Wed, 4 Dec 2019 13:06:22 -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