]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commit
bpf, sockmap: Fix double uncharge the mem of sk_msg
authorWang Yufen <wangyufen@huawei.com>
Fri, 4 Mar 2022 08:11:45 +0000 (16:11 +0800)
committerStefan Bader <stefan.bader@canonical.com>
Fri, 20 May 2022 12:39:11 +0000 (14:39 +0200)
commit4cb38f26f4d242a89a5340b7cad7fef136f17bb1
treed68cabcb8a5c9d26d287e00899408e2cfd465ec2
parentb8375314c6b835b033090ee8f4f8683097116774
bpf, sockmap: Fix double uncharge the mem of sk_msg

BugLink: https://bugs.launchpad.net/bugs/1969110
[ Upstream commit 2486ab434b2c2a14e9237296db00b1e1b7ae3273 ]

If tcp_bpf_sendmsg is running during a tear down operation, psock may be
freed.

tcp_bpf_sendmsg()
 tcp_bpf_send_verdict()
  sk_msg_return()
  tcp_bpf_sendmsg_redir()
   unlikely(!psock))
     sk_msg_free()

The mem of msg has been uncharged in tcp_bpf_send_verdict() by
sk_msg_return(), and would be uncharged by sk_msg_free() again. When psock
is null, we can simply returning an error code, this would then trigger
the sk_msg_free_nocharge in the error path of __SK_REDIRECT and would have
the side effect of throwing an error up to user space. This would be a
slight change in behavior from user side but would look the same as an
error if the redirect on the socket threw an error.

This issue can cause the following info:
WARNING: CPU: 0 PID: 2136 at net/ipv4/af_inet.c:155 inet_sock_destruct+0x13c/0x260
Call Trace:
 <TASK>
 __sk_destruct+0x24/0x1f0
 sk_psock_destroy+0x19b/0x1c0
 process_one_work+0x1b3/0x3c0
 worker_thread+0x30/0x350
 ? process_one_work+0x3c0/0x3c0
 kthread+0xe6/0x110
 ? kthread_complete_and_exit+0x20/0x20
 ret_from_fork+0x22/0x30
 </TASK>

Fixes: 604326b41a6f ("bpf, sockmap: convert to generic sk_msg interface")
Signed-off-by: Wang Yufen <wangyufen@huawei.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: John Fastabend <john.fastabend@gmail.com>
Link: https://lore.kernel.org/bpf/20220304081145.2037182-5-wangyufen@huawei.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
(cherry picked from commit cb6f141ae705af0101e819065a79e6d029f6e393)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
net/ipv4/tcp_bpf.c