diff --git a/COPYING-5.14.0-611.54.3.el9 b/COPYING-5.14.0-611.54.6.el9 similarity index 100% rename from COPYING-5.14.0-611.54.3.el9 rename to COPYING-5.14.0-611.54.6.el9 diff --git a/kernel/ptrace.c b/kernel/ptrace.c index a0fd4bd55d..ea8d8a222a 100644 --- a/kernel/ptrace.c +++ b/kernel/ptrace.c @@ -348,10 +348,13 @@ ok: */ smp_rmb(); mm = task->mm; - if (mm && - ((get_dumpable(mm) != SUID_DUMP_USER) && - !ptrace_has_cap(mm->user_ns, mode))) - return -EPERM; + if (mm) { + if ((get_dumpable(mm) != SUID_DUMP_USER) && + !ptrace_has_cap(mm->user_ns, mode)) + return -EPERM; + } else if (!ptrace_has_cap(&init_user_ns, mode)) { + return -EPERM; + } return security_ptrace_access_check(task, mode); } diff --git a/net/core/gro.c b/net/core/gro.c index 50a0bc5093..cbfb58bfa3 100644 --- a/net/core/gro.c +++ b/net/core/gro.c @@ -222,10 +222,12 @@ done: p->data_len += len; p->truesize += delta_truesize; p->len += len; + skb_shinfo(p)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG; if (lp != p) { lp->data_len += len; lp->truesize += delta_truesize; lp->len += len; + skb_shinfo(lp)->flags |= skbinfo->flags & SKBFL_SHARED_FRAG; } NAPI_GRO_CB(skb)->same_flow = 1; return 0; diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 90a908882e..79a943a95b 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2026,6 +2026,7 @@ struct sk_buff *__pskb_copy_fclone(struct sk_buff *skb, int headroom, skb_frag_ref(skb, i); } skb_shinfo(n)->nr_frags = i; + skb_shinfo(n)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; } if (skb_has_frag_list(skb)) { @@ -4028,6 +4029,8 @@ onlymerged: tgt->ip_summed = CHECKSUM_PARTIAL; skb->ip_summed = CHECKSUM_PARTIAL; + skb_shinfo(tgt)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + /* Yak, is it really working this way? Some helper please? */ skb->len -= shiftlen; skb->data_len -= shiftlen; @@ -5740,6 +5743,8 @@ bool skb_try_coalesce(struct sk_buff *to, struct sk_buff *from, from_shinfo->frags, from_shinfo->nr_frags * sizeof(skb_frag_t)); to_shinfo->nr_frags += from_shinfo->nr_frags; + if (from_shinfo->nr_frags) + to_shinfo->flags |= from_shinfo->flags & SKBFL_SHARED_FRAG; if (!skb_cloned(from)) from_shinfo->nr_frags = 0; diff --git a/net/ipv4/udp_offload.c b/net/ipv4/udp_offload.c index 911e475e8e..153e69155b 100644 --- a/net/ipv4/udp_offload.c +++ b/net/ipv4/udp_offload.c @@ -487,6 +487,8 @@ static int skb_gro_receive_list(struct sk_buff *p, struct sk_buff *skb) p->truesize += skb->truesize; p->len += skb->len; + skb_shinfo(p)->flags |= skb_shinfo(skb)->flags & SKBFL_SHARED_FRAG; + NAPI_GRO_CB(skb)->same_flow = 1; return 0;