]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
bpf, sockmap: Fix sk_msg_reset_curr
authorZijian Zhang <zijianzhang@bytedance.com>
Wed, 6 Nov 2024 22:25:20 +0000 (22:25 +0000)
committerMartin KaFai Lau <martin.lau@kernel.org>
Thu, 7 Nov 2024 00:01:54 +0000 (16:01 -0800)
commit955afd57dc4bf7e8c620a0a9e3af3c881c2c6dff
tree4b3ac9c2f56be85c4f070a1b1a0eb5eaf5d129d7
parent5d609ba262475db450ba69b8e8a557bd768ac07a
bpf, sockmap: Fix sk_msg_reset_curr

Found in the test_txmsg_pull in test_sockmap,
```
txmsg_cork = 512; // corking is importrant here
opt->iov_length = 3;
opt->iov_count = 1;
opt->rate = 512; // sendmsg will be invoked 512 times
```
The first sendmsg will send an sk_msg with size 3, and bpf_msg_pull_data
will be invoked the first time. sk_msg_reset_curr will reset the copybreak
from 3 to 0. In the second sendmsg, since we are in the stage of corking,
psock->cork will be reused in func sk_msg_alloc. msg->sg.copybreak is 0
now, the second msg will overwrite the first msg. As a result, we could
not pass the data integrity test.

The same problem happens in push and pop test. Thus, fix sk_msg_reset_curr
to restore the correct copybreak.

Fixes: bb9aefde5bba ("bpf: sockmap, updating the sg structure should also update curr")
Signed-off-by: Zijian Zhang <zijianzhang@bytedance.com>
Link: https://lore.kernel.org/r/20241106222520.527076-9-zijianzhang@bytedance.com
Signed-off-by: Martin KaFai Lau <martin.lau@kernel.org>
net/core/filter.c