Merge branch 'fix sockmap + stream af_unix memleak'

Browse source

John Fastabend says:

====================
There was a memleak when streaming af_unix sockets were inserted into
multiple sockmap slots and/or maps. This is because each insert would
call a proto update operatino and these must be allowed to be called
multiple times. The streaming af_unix implementation recently added
a refcnt to handle a use after free issue, however it introduced a
memleak when inserted into multiple maps.

This series fixes the memleak, adds a note in the code so we remember
that proto updates need to support this. And then we add three tests
for each of the slightly different iterations of adding sockets into
multiple maps. I kept them as 3 independent test cases here. I have
some slight preference for this they could however be a single test,
but then you don't get to run them independently which was sort of
useful while debugging.
====================

Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>

...

This commit is contained in:

Martin KaFai Lau 2024-01-03 16:34:32 -08:00

parent b4560055c8 bdbca46d3f

commit 417fa6d163

3 changed files with 236 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

5

include/linux/skmsg.h

View file

21

net/unix/unix_bpf.c

View file

214

tools/testing/selftests/bpf/prog_tests/sockmap_basic.c

View file