hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9HVTH CVE: CVE-2024-26921
--------------------------------
Fix KABI break when backport CVE-2024-26921 patch by reverting modification of struct sk_buff.
Fixes: 18685451fc4e ("inet: inet_defrag: prevent sk release while still in use") Signed-off-by: Ziyang Xuan william.xuanziyang@huawei.com --- include/linux/skbuff.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 9f38aad04145..c7d1d8b5f41b 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -683,7 +683,10 @@ struct sk_buff { struct list_head list; };
- struct sock *sk; + union { + struct sock *sk; + int ip_defrag_offset; + };
union { ktime_t tstamp;