Commit 3546b9b8 authored Dec 07, 2020 by Björn Töpel Committed by Daniel Borkmann Dec 08, 2020

xsk: Validate socket state in xsk_recvmsg, prior touching socket members



In AF_XDP the socket state needs to be checked, prior touching the
members of the socket. This was not the case for the recvmsg
implementation. Fix that by moving the xsk_is_bound() call.

Fixes: 45a86681 ("xsk: Add support for recvmsg()")
Reported-by: kernel test robot <oliver.sang@intel.com>
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
Link: https://lore.kernel.org/bpf/20201207082008.132263-1-bjorn.topel@gmail.com

parent 2f4b0319

net/xdp/xsk.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -554,12 +554,12 @@ static int xsk_recvmsg(struct socket sock, struct msghdr m, size_t len, int fl
		struct sock *sk = sock->sk;
		struct xdp_sock *xs = xdp_sk(sk);

		if (unlikely(!xsk_is_bound(xs)))
		return -ENXIO;
		if (unlikely(!(xs->dev->flags & IFF_UP)))
		return -ENETDOWN;
		if (unlikely(!xs->rx))
		return -ENOBUFS;
		if (unlikely(!xsk_is_bound(xs)))
		return -ENXIO;
		if (unlikely(need_wait))
		return -EOPNOTSUPP;

Admin message