diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-08-28 09:22:54 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2026-08-28 09:22:54 +0300 |
| commit | 19ccd439d0087525b48dfcc8e584a0a940230744 (patch) | |
| tree | 75e0e86253747fd036815505b8c48c9668aafb3c | |
| parent | 7d92803242afbafe8b374f1249028232cd45e094 (diff) | |
| parent | 5bbb9c9f8f808710e2123f2b30f0d61d7d698f52 (diff) | |
| download | linux-rolling-lts.tar.xz | |
Merge v6.18.48linux-rolling-lts
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | net/ipv4/inet_fragment.c | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 VERSION = 6 PATCHLEVEL = 18 -SUBLEVEL = 47 +SUBLEVEL = 48 EXTRAVERSION = NAME = Baby Opossum Posse diff --git a/net/ipv4/inet_fragment.c b/net/ipv4/inet_fragment.c index 6eeb47f6dbdd..9672d80488d1 100644 --- a/net/ipv4/inet_fragment.c +++ b/net/ipv4/inet_fragment.c @@ -437,6 +437,13 @@ int inet_frag_queue_insert(struct inet_frag_queue *q, struct sk_buff *skb, { struct sk_buff *last = q->fragments_tail; + /* An IP fragment is never a GSO packet, but an untrusted source + * (virtio_net_hdr) may have attached GSO metadata to it. Do not let + * that reach the reassembled skb, whose head keeps the first + * fragment's shinfo and whose frag_list is not GRO-shaped. + */ + skb_gso_reset(skb); + /* RFC5722, Section 4, amended by Errata ID : 3089 * When reassembling an IPv6 datagram, if * one or more its constituent fragments is determined to be an |