Commit 33a76c15 authored Jun 11, 2020 by Andrey Ignatov Committed by Greg Kroah-Hartman Jun 24, 2020

bpf: Fix memlock accounting for sock_hash



[ 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: 604326b4 ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Andrey Ignatov <rdna@fb.com>
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Link: https://lore.kernel.org/bpf/20200612000857.2881453-1-rdna@fb.com


Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 93b67573

net/core/sock_map.c

+4 −0

Original line number	Diff line number	Diff line
		@@ -837,11 +837,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;
		}