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 A2A1BC433E0 for ; Thu, 18 Jun 2020 02:28:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 78713214DB for ; Thu, 18 Jun 2020 02:28:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592447295; bh=0jMV01Hr/k5fwyr9/IzNm3Brrq5ZzBS2voK5XEJ5s1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=JQ+eRhd6gmpXeae2HR8ZtCNbHEgm8BnZIK+Fz71Kol0GxUrLWV5wQC5nvmavlHzNL 7HvOYYObX+17aZ9EXStrlX3OYoa0A851H7C2qQZqCjnNUDYSB3lJ9uApz8jir7fpHj zXvGk8ar5IAOIZKFnXNV7ORHj6Q3egq9DhOKaQSo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387611AbgFRC2N (ORCPT ); Wed, 17 Jun 2020 22:28:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:46480 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728513AbgFRBQ0 (ORCPT ); Wed, 17 Jun 2020 21:16:26 -0400 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 314F221D82; Thu, 18 Jun 2020 01:16:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1592442986; bh=0jMV01Hr/k5fwyr9/IzNm3Brrq5ZzBS2voK5XEJ5s1c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tlvu5LEQYWQhtM5WmA+gaIl6/9ZO90JTBe8o+sdiiFIJPpz1FCh8SCdmeiFSzBiHx aJ7VTGdiFN2ITSJwzCw9Nag/HAXtWKZPdbfA8BK9TMm5of6soKc95d0ggEFNS7NPIA bLvhFUXU2DBUyeCq9cDBLbFJwMzQXMvwj9KLs5MA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrey Ignatov , Alexei Starovoitov , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 386/388] bpf: Fix memlock accounting for sock_hash Date: Wed, 17 Jun 2020 21:08:03 -0400 Message-Id: <20200618010805.600873-386-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200618010805.600873-1-sashal@kernel.org> References: <20200618010805.600873-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: Andrey Ignatov [ Upstream commit 60e5ca8a64bad8f3e2e20a1e57846e497361c700 ] Add missed bpf_map_charge_init() in sock_hash_alloc() and correspondingly bpf_map_charge_finish() on ENOMEM. It was found accidentally while working on unrelated selftest that checks "map->memory.pages > 0" is true for all map types. Before: # bpftool m l ... 3692: sockhash name m_sockhash flags 0x0 key 4B value 4B max_entries 8 memlock 0B After: # bpftool m l ... 84: sockmap name m_sockmap flags 0x0 key 4B value 4B max_entries 8 memlock 4096B Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface") Signed-off-by: Andrey Ignatov Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20200612000857.2881453-1-rdna@fb.com Signed-off-by: Sasha Levin --- net/core/sock_map.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/core/sock_map.c b/net/core/sock_map.c index 7e858c1dd711..591457fcbd02 100644 --- a/net/core/sock_map.c +++ b/net/core/sock_map.c @@ -984,11 +984,15 @@ static struct bpf_map *sock_hash_alloc(union bpf_attr *attr) err = -EINVAL; goto free_htab; } + err = bpf_map_charge_init(&htab->map.memory, cost); + if (err) + goto free_htab; htab->buckets = bpf_map_area_alloc(htab->buckets_num * sizeof(struct bpf_htab_bucket), htab->map.numa_node); if (!htab->buckets) { + bpf_map_charge_finish(&htab->map.memory); err = -ENOMEM; goto free_htab; } -- 2.25.1