UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

xsk: Fix crash in poll when device does not support ndo_xsk_wakeup 

Fixes a crash in poll() when an AF_XDP socket is opened in copy mode
and the bound device does not have ndo_xsk_wakeup defined. Avoid
trying to call the non-existing ndo and instead call the internal xsk
sendmsg function to send packets in the same way (from the
application's point of view) as calling sendmsg() in any mode or
poll() in zero-copy mode would have done. The application should
behave in the same way independent on if zero-copy mode or copy mode
is used.

Fixes: 77cd0d7b3f ("xsk: add support for need_wakeup flag in AF_XDP rings")
Reported-by: syzbot+a5765ed8cdb1cca4d249@syzkaller.appspotmail.com
Signed-off-by: Magnus Karlsson <magnus.karlsson@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>
Link: https://lore.kernel.org/bpf/1569997919-11541-1-git-send-email-magnus.karlsson@intel.com
This commit is contained in:
Magnus Karlsson 2019-10-02 08:31:59 +02:00 committed by Daniel Borkmann
parent e55190f26f
commit df551058f7
1 changed files with 27 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
net/xdp/xsk.c
View File

@ -305,9 +305,8 @@ out:
} }
EXPORT_SYMBOL(xsk_umem_consume_tx); EXPORT_SYMBOL(xsk_umem_consume_tx);
static int xsk_zc_xmit(struct sock *sk) static int xsk_zc_xmit(struct xdp_sock *xs)
{ {
struct xdp_sock *xs = xdp_sk(sk);
struct net_device *dev = xs->dev; struct net_device *dev = xs->dev;
return dev->netdev_ops->ndo_xsk_wakeup(dev, xs->queue_id, return dev->netdev_ops->ndo_xsk_wakeup(dev, xs->queue_id,
@ -327,11 +326,10 @@ static void xsk_destruct_skb(struct sk_buff *skb)
sock_wfree(skb); sock_wfree(skb);
} }
static int xsk_generic_xmit(struct sock *sk, struct msghdr *m, static int xsk_generic_xmit(struct sock *sk)
size_t total_len)
{ {
u32 max_batch = TX_BATCH_SIZE;
struct xdp_sock *xs = xdp_sk(sk); struct xdp_sock *xs = xdp_sk(sk);
u32 max_batch = TX_BATCH_SIZE;
bool sent_frame = false; bool sent_frame = false;
struct xdp_desc desc; struct xdp_desc desc;
struct sk_buff *skb; struct sk_buff *skb;
@ -394,6 +392,18 @@ out:
return err; return err;
} }
static int __xsk_sendmsg(struct sock *sk)
{
struct xdp_sock *xs = xdp_sk(sk);
if (unlikely(!(xs->dev->flags & IFF_UP)))
return -ENETDOWN;
if (unlikely(!xs->tx))
return -ENOBUFS;
return xs->zc ? xsk_zc_xmit(xs) : xsk_generic_xmit(sk);
}
static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len) static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
{ {
bool need_wait = !(m->msg_flags & MSG_DONTWAIT); bool need_wait = !(m->msg_flags & MSG_DONTWAIT);
@ -402,21 +412,18 @@ static int xsk_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)
if (unlikely(!xsk_is_bound(xs))) if (unlikely(!xsk_is_bound(xs)))
return -ENXIO; return -ENXIO;
if (unlikely(!(xs->dev->flags & IFF_UP))) if (unlikely(need_wait))
return -ENETDOWN;
if (unlikely(!xs->tx))
return -ENOBUFS;
if (need_wait)
return -EOPNOTSUPP; return -EOPNOTSUPP;
return (xs->zc) ? xsk_zc_xmit(sk) : xsk_generic_xmit(sk, m, total_len); return __xsk_sendmsg(sk);
} }
static unsigned int xsk_poll(struct file *file, struct socket *sock, static unsigned int xsk_poll(struct file *file, struct socket *sock,
struct poll_table_struct *wait) struct poll_table_struct *wait)
{ {
unsigned int mask = datagram_poll(file, sock, wait); unsigned int mask = datagram_poll(file, sock, wait);
struct xdp_sock *xs = xdp_sk(sock->sk); struct sock *sk = sock->sk;
struct xdp_sock *xs = xdp_sk(sk);
struct net_device *dev; struct net_device *dev;
struct xdp_umem *umem; struct xdp_umem *umem;
@ -426,9 +433,14 @@ static unsigned int xsk_poll(struct file *file, struct socket *sock,
dev = xs->dev; dev = xs->dev;
umem = xs->umem; umem = xs->umem;
if (umem->need_wakeup) if (umem->need_wakeup) {
dev->netdev_ops->ndo_xsk_wakeup(dev, xs->queue_id, if (dev->netdev_ops->ndo_xsk_wakeup)
umem->need_wakeup); dev->netdev_ops->ndo_xsk_wakeup(dev, xs->queue_id,
umem->need_wakeup);
else
/* Poll needs to drive Tx also in copy mode */
__xsk_sendmsg(sk);
}
if (xs->rx && !xskq_empty_desc(xs->rx)) if (xs->rx && !xskq_empty_desc(xs->rx))
mask |= POLLIN | POLLRDNORM; mask |= POLLIN | POLLRDNORM;