Skip to content

Commit 3e019d8

Browse files
magnus-karlssonborkmann
authored andcommitted
xsk: Fix xsk_diag use-after-free error during socket cleanup
Fix a use-after-free error that is possible if the xsk_diag interface is used after the socket has been unbound from the device. This can happen either due to the socket being closed or the device disappearing. In the early days of AF_XDP, the way we tested that a socket was not bound to a device was to simply check if the netdevice pointer in the xsk socket structure was NULL. Later, a better system was introduced by having an explicit state variable in the xsk socket struct. For example, the state of a socket that is on the way to being closed and has been unbound from the device is XSK_UNBOUND. The commit in the Fixes tag below deleted the old way of signalling that a socket is unbound, setting dev to NULL. This in the belief that all code using the old way had been exterminated. That was unfortunately not true as the xsk diagnostics code was still using the old way and thus does not work as intended when a socket is going down. Fix this by introducing a test against the state variable. If the socket is in the state XSK_UNBOUND, simply abort the diagnostic's netlink operation. Fixes: 18b1ab7 ("xsk: Fix race at socket teardown") Reported-by: [email protected] Signed-off-by: Magnus Karlsson <[email protected]> Signed-off-by: Daniel Borkmann <[email protected]> Tested-by: [email protected] Tested-by: Maciej Fijalkowski <[email protected]> Reviewed-by: Maciej Fijalkowski <[email protected]> Link: https://lore.kernel.org/bpf/[email protected]
1 parent 7d35eb1 commit 3e019d8

File tree

1 file changed

+3
-0
lines changed

1 file changed

+3
-0
lines changed

net/xdp/xsk_diag.c

+3
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,9 @@ static int xsk_diag_fill(struct sock *sk, struct sk_buff *nlskb,
111111
sock_diag_save_cookie(sk, msg->xdiag_cookie);
112112

113113
mutex_lock(&xs->mutex);
114+
if (READ_ONCE(xs->state) == XSK_UNBOUND)
115+
goto out_nlmsg_trim;
116+
114117
if ((req->xdiag_show & XDP_SHOW_INFO) && xsk_diag_put_info(xs, nlskb))
115118
goto out_nlmsg_trim;
116119

0 commit comments

Comments
 (0)