Commit 5d902372 authored Jun 12, 2018 by Björn Töpel Committed by Daniel Borkmann Jun 12, 2018

xsk: re-add queue id check for XDP_SKB path



Commit 173d3adb ("xsk: add zero-copy support for Rx") introduced a
regression on the XDP_SKB receive path, when the queue id checks were
removed. Now, they are back again.

Fixes: 173d3adb ("xsk: add zero-copy support for Rx")
Reported-by: Qi Zhang <qi.z.zhang@intel.com>
Signed-off-by: Björn Töpel <bjorn.topel@intel.com>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

parent 6892286e

net/xdp/xsk.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,9 @@ int xsk_generic_rcv(struct xdp_sock xs, struct xdp_buff xdp)
		u64 addr;
		int err;

		if (xs->dev != xdp->rxq->dev \|\| xs->queue_id != xdp->rxq->queue_index)
		return -EINVAL;

		if (!xskq_peek_addr(xs->umem->fq, &addr) \|\|
		len > xs->umem->chunk_size_nohr) {
		xs->rx_dropped++;

Admin message