Commit 8ea1372b authored by Zhang Wensheng's avatar Zhang Wensheng Committed by Zheng Zengkai
Browse files

kabi: fix kabi broken in struct fuse_args 

mainline inclusion
from mainline-v5.17-rc8
commit 0c4bcfde
category: bugfix
bugzilla: 186448, https://gitee.com/openeuler/kernel/issues/I4YS7O


CVE: CVE-2022-1011

--------------------------------

Because create a new user_pages in fuse_args, to fix kabi change.

Signed-off-by: default avatarZhang Wensheng <zhangwensheng5@huawei.com>
Reviewed-by: default avatarHou Tao <houtao1@huawei.com>
Reviewed-by: default avatarXiu Jianfeng <xiujianfeng@huawei.com>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 47f83f5e

fs/fuse/fuse_i.h

+3 −1
Original line number Diff line number Diff line
@@ -266,11 +266,13 @@ struct fuse_args { 
	bool nocreds:1;

	bool in_pages:1;

	bool out_pages:1;

	bool user_pages:1;

	bool out_argvar:1;

	bool page_zeroing:1;

	bool page_replace:1;

	bool may_block:1;

#ifndef __GENKSYMS__

	bool user_pages:1;

#endif

	struct fuse_in_arg in_args[3];

	struct fuse_arg out_args[2];

	void (*end)(struct fuse_mount *fm, struct fuse_args *args, int error);