diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:17:07 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-08-07 13:17:07 +0000 |
| commit | dbbbbcd6a31c838165cb72aecb42d8b395c65068 (patch) | |
| tree | 013a5765c5b2dca0d8118acbfadc4af0015977b8 /drivers/net/tap.c | |
| parent | Releasing progress-linux version 6.9.11-1~progress7.99u1. (diff) | |
| download | linux-dbbbbcd6a31c838165cb72aecb42d8b395c65068.tar.xz linux-dbbbbcd6a31c838165cb72aecb42d8b395c65068.zip | |
Merging upstream version 6.9.12.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'drivers/net/tap.c')
| -rw-r--r-- | drivers/net/tap.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/tap.c b/drivers/net/tap.c index 9f0495e8df..feeeac715c 100644 --- a/drivers/net/tap.c +++ b/drivers/net/tap.c @@ -1177,6 +1177,11 @@ static int tap_get_user_xdp(struct tap_queue *q, struct xdp_buff *xdp) struct sk_buff *skb; int err, depth; + if (unlikely(xdp->data_end - xdp->data < ETH_HLEN)) { + err = -EINVAL; + goto err; + } + if (q->flags & IFF_VNET_HDR) vnet_hdr_len = READ_ONCE(q->vnet_hdr_sz); |