From 108567834dad53630b3684734a60195fe1462bda Mon Sep 17 00:00:00 2001 From: Zhang Wensheng Date: Mon, 21 Mar 2022 09:37:31 +0000 Subject: [PATCH] kabi: fix kabi broken in struct fuse_in mainline inclusion from mainline-v5.17-rc8 commit 0c4bcfdecb1ac0967619ee7ff44871d93c08c909 category: bugfix bugzilla: 186448, https://gitee.com/openeuler/kernel/issues/I4YORE CVE: CVE-2022-1011 -------------------------------- Because create a new user_pages in fuse_in, to fix kabi change. Signed-off-by: Zhang Wensheng Reviewed-by: Tao Hou Reviewed-by: Xiu Jianfeng Signed-off-by: Yongqiang Liu --- fs/fuse/fuse_i.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 27f3b6d4f11c..0981011c10c6 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -174,8 +174,10 @@ struct fuse_in { /** True if the data for the last argument is in req->pages */ unsigned argpages:1; +#ifndef __GENKSYMS__ /** True if direct write */ unsigned user_pages:1; +#endif /** Number of arguments */ unsigned numargs; -- GitLab