[ Sasha's backport helper bot ]
Hi,
✅ All tests passed successfully. No issues detected.
No action required from the submitter.
The upstream commit SHA1 provided is correct: f93431c86b631bbca5614c66f966bf3ddb3c2803
WARNING: Author mismatch between patch and upstream commit:
Backport author: Abdelkareem Abdelsaamad<kareemem@xxxxxxxxxx>
Commit author: Wang Yufen<wangyufen@xxxxxxxxxx>
Status in newer kernel trees:
6.13.y | Present (exact SHA1)
6.12.y | Present (exact SHA1)
6.6.y | Present (exact SHA1)
6.1.y | Present (exact SHA1)
5.15.y | Not found
Note: The patch differs from the upstream commit:
---
1: f93431c86b631 ! 1: bc8424dc08f8e ipv6: Fix signed integer overflow in __ip6_append_data
@@ Metadata
## Commit message ##
ipv6: Fix signed integer overflow in __ip6_append_data
+ [ Upstream commit f93431c86b631bbca5614c66f966bf3ddb3c2803 ]
+
Resurrect ubsan overflow checks and ubsan report this warning,
fix it by change the variable [length] type to size_t.
@@ Commit message
Signed-off-by: Wang Yufen <wangyufen@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20220607120028.845916-1-wangyufen@xxxxxxxxxx
Signed-off-by: Jakub Kicinski <kuba@xxxxxxxxxx>
+ Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
+ [Conflict due to
+ f37a4cc6bb0b ("udp6: pass flow in ip6_make_skb together with cork")
+ not in the tree
+ ]
+ Signed-off-by: Abdelkareem Abdelsaamad <kareemem@xxxxxxxxxx>
## include/net/ipv6.h ##
@@ include/net/ipv6.h: int ip6_find_1stfragopt(struct sk_buff *skb, u8 **nexthdr);
@@ include/net/ipv6.h: struct sk_buff *__ip6_make_skb(struct sock *sk, struct sk_bu
int len, int odd, struct sk_buff *skb),
- void *from, int length, int transhdrlen,
+ void *from, size_t length, int transhdrlen,
- struct ipcm6_cookie *ipc6,
+ struct ipcm6_cookie *ipc6, struct flowi6 *fl6,
struct rt6_info *rt, unsigned int flags,
struct inet_cork_full *cork);
@@ net/ipv6/ip6_output.c: EXPORT_SYMBOL_GPL(ip6_flush_pending_frames);
int len, int odd, struct sk_buff *skb),
- void *from, int length, int transhdrlen,
+ void *from, size_t length, int transhdrlen,
- struct ipcm6_cookie *ipc6, struct rt6_info *rt,
- unsigned int flags, struct inet_cork_full *cork)
- {
+ struct ipcm6_cookie *ipc6, struct flowi6 *fl6,
+ struct rt6_info *rt, unsigned int flags,
+ struct inet_cork_full *cork)
---
Results of testing on various branches:
| Branch | Patch Apply | Build Test |
|---------------------------|-------------|------------|
| stable/linux-5.10.y | Success | Success |
| stable/linux-5.15.y | Success | Success |
