From: Li RongQing Date: Thu, 11 Jun 2020 05:11:06 +0000 (+0800) Subject: xdp: Fix xsk_generic_xmit errno X-Git-Tag: v5.7.6~104 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47b8c7029217946566d1ab9877e10a2fecf4bfa9;p=thirdparty%2Fkernel%2Fstable.git xdp: Fix xsk_generic_xmit errno [ Upstream commit aa2cad0600ed2ca6a0ab39948d4db1666b6c962b ] Propagate sock_alloc_send_skb error code, not set it to EAGAIN unconditionally, when fail to allocate skb, which might cause that user space unnecessary loops. Fixes: 35fcde7f8deb ("xsk: support for Tx") Signed-off-by: Li RongQing Signed-off-by: Daniel Borkmann Acked-by: Björn Töpel Link: https://lore.kernel.org/bpf/1591852266-24017-1-git-send-email-lirongqing@baidu.com Signed-off-by: Sasha Levin --- diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index c350108aa38de..a4676107fad05 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -397,10 +397,8 @@ static int xsk_generic_xmit(struct sock *sk) len = desc.len; skb = sock_alloc_send_skb(sk, len, 1, &err); - if (unlikely(!skb)) { - err = -EAGAIN; + if (unlikely(!skb)) goto out; - } skb_put(skb, len); addr = desc.addr;