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: Yue Haibing yuehaibing@huawei.com Reviewed-by: Xiu Jianfeng xiujianfeng@huawei.com Signed-off-by: Yongqiang Liu liuyongqiang13@huawei.com --- include/linux/skbuff.h | 2 ++ 1 file changed, 2 insertions(+)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 4524bef053b8..b67d42871ee9 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -801,7 +801,9 @@ struct sk_buff { __u8 decrypted:1; #endif
+#ifndef __GENKSYMS__ __u8 scm_io_uring:1; +#endif
#ifdef CONFIG_NET_SCHED __u16 tc_index; /* traffic control index */