From: Zhihao Cheng chengzhihao1@huawei.com
hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/I5WFKI CVE: CVE-2022-2602
--------------------------------
In order to fix CVE-2022-2602, member 'scm_io_uring' is imported into sk_buff, fix broken kabi in sk_buff.
Signed-off-by: Zhihao Cheng chengzhihao1@huawei.com Reviewed-by: Xiu Jianfeng xiujianfeng@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- include/linux/skbuff.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 6600a269d675..4739ce5f0913 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -867,7 +867,6 @@ struct sk_buff { #ifdef CONFIG_TLS_DEVICE __u8 decrypted:1; #endif - __u8 scm_io_uring:1;
#ifdef CONFIG_NET_SCHED __u16 tc_index; /* traffic control index */ @@ -918,7 +917,7 @@ struct sk_buff { __u32 headers_end[0]; /* public: */
- KABI_RESERVE(1) + KABI_USE(1, __u8 scm_io_uring:1) KABI_RESERVE(2) KABI_RESERVE(3) KABI_RESERVE(4)