From: Sasha Levin <sashal@kernel.org>
To: stable@vger.kernel.org
Cc: Harshvardhan Jha <harshvardhan.j.jha@oracle.com>,
Sasha Levin <sashal@kernel.org>
Subject: Re: [PATCH 5.4.y 5.10.y 1/4] skbuff: introduce skb_expand_head()
Date: Wed, 25 Dec 2024 20:21:52 -0500 [thread overview]
Message-ID: <20241225192848-210522801797f885@stable.kernel.org> (raw)
In-Reply-To: <20241225051624.127745-2-harshvardhan.j.jha@oracle.com>
[ Sasha's backport helper bot ]
Hi,
The upstream commit SHA1 provided is correct: f1260ff15a71b8fc122b2c9abd8a7abffb6e0168
WARNING: Author mismatch between patch and upstream commit:
Backport author: Harshvardhan Jha <harshvardhan.j.jha@oracle.com>
Commit author: Vasily Averin <vvs@virtuozzo.com>
Status in newer kernel trees:
6.12.y | Present (exact SHA1)
6.6.y | Present (exact SHA1)
6.1.y | Present (exact SHA1)
5.15.y | Present (exact SHA1)
5.10.y | Not found
Note: The patch differs from the upstream commit:
---
1: f1260ff15a71 ! 1: ee7ccf9396c7 skbuff: introduce skb_expand_head()
@@ Metadata
## Commit message ##
skbuff: introduce skb_expand_head()
+ [ Upstream commit f1260ff15a71b8fc122b2c9abd8a7abffb6e0168 ]
+
Like skb_realloc_headroom(), new helper increases headroom of specified skb.
Unlike skb_realloc_headroom(), it does not allocate a new skb if possible;
copies skb->sk on new skb when as needed and frees original skb in case
@@ Commit message
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
+ (cherry picked from commit f1260ff15a71b8fc122b2c9abd8a7abffb6e0168)
+ Signed-off-by: Harshvardhan Jha <harshvardhan.j.jha@oracle.com>
## include/linux/skbuff.h ##
@@ include/linux/skbuff.h: static inline struct sk_buff *__pskb_copy(struct sk_buff *skb, int headroom,
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
| stable/linux-5.4.y | Success | Success |
next prev parent reply other threads:[~2024-12-26 1:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-12-25 5:16 [PATCH 5.4.y 5.10.y 0/4] Backport of CVE-2024-44986 fix to stable 5.4 and 5.10 Harshvardhan Jha
2024-12-25 5:16 ` [PATCH 5.4.y 5.10.y 1/4] skbuff: introduce skb_expand_head() Harshvardhan Jha
2024-12-26 1:21 ` Sasha Levin [this message]
2024-12-26 12:44 ` Harshvardhan Jha
2024-12-26 21:45 ` Sasha Levin
2024-12-25 5:16 ` [PATCH 5.4.y 5.10.y 2/4] ipv6: use skb_expand_head in ip6_finish_output2 Harshvardhan Jha
2024-12-26 1:21 ` Sasha Levin
2024-12-25 5:16 ` [PATCH 5.4.y 5.10.y 3/4] ipv6: use skb_expand_head in ip6_xmit Harshvardhan Jha
2024-12-26 1:21 ` Sasha Levin
2024-12-25 5:16 ` [PATCH 5.4.y 5.10.y 4/4] ipv6: fix possible UAF in ip6_finish_output2() Harshvardhan Jha
2024-12-26 1:21 ` Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20241225192848-210522801797f885@stable.kernel.org \
--to=sashal@kernel.org \
--cc=harshvardhan.j.jha@oracle.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.