Skip to content

Commit 85c2c79

Browse files
magnus-karlssonMartin KaFai Lau
authored andcommitted
xsk: fix refcount underflow in error path
Fix a refcount underflow problem reported by syzbot that can happen when a system is running out of memory. If xp_alloc_tx_descs() fails, and it can only fail due to not having enough memory, then the error path is triggered. In this error path, the refcount of the pool is decremented as it has incremented before. However, the reference to the pool in the socket was not nulled. This means that when the socket is closed later, the socket teardown logic will think that there is a pool attached to the socket and try to decrease the refcount again, leading to a refcount underflow. I chose this fix as it involved adding just a single line. Another option would have been to move xp_get_pool() and the assignment of xs->pool to after the if-statement and using xs_umem->pool instead of xs->pool in the whole if-statement resulting in somewhat simpler code, but this would have led to much more churn in the code base perhaps making it harder to backport. Fixes: ba3beec ("xsk: Fix possible crash when multiple sockets are created") Reported-by: [email protected] Signed-off-by: Magnus Karlsson <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Martin KaFai Lau <[email protected]>
1 parent 999f663 commit 85c2c79

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

net/xdp/xsk.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -994,6 +994,7 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len)
994994
err = xp_alloc_tx_descs(xs->pool, xs);
995995
if (err) {
996996
xp_put_pool(xs->pool);
997+
xs->pool = NULL;
997998
sockfd_put(sock);
998999
goto out_unlock;
9991000
}

0 commit comments

Comments
 (0)