Unverified Commit a0194593 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!12536 kabi: use CONFIG_KABI_RESERVE to control reservation in ucount_type and user_table 

Merge Pull Request from: @ci-robot 
 
PR sync from: GONG Ruiqi <gongruiqi1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7GPGU65CZ5ORKVIWTOVA2JMIFXYUWG2I/ 
 
https://gitee.com/openeuler/kernel/issues/I4MYYH 
 
Link:https://gitee.com/openeuler/kernel/pulls/12536

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents d1a7421a 5d12a17b

include/linux/user_namespace.h

+2 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ enum ucount_type { 
	UCOUNT_INOTIFY_INSTANCES,

	UCOUNT_INOTIFY_WATCHES,

#endif

#ifdef CONFIG_KABI_RESERVE

	/* These 15 members are reserved (with extra margin) for the future

	 * enlargement of enum ucount_type, as how RH8.1 did it. This number

	 * should be enough, as 6 of them are very likely to be used in the near
@@ -71,6 +72,7 @@ enum ucount_type { 
	UCOUNT_KABI_RESERVE13,

	UCOUNT_KABI_RESERVE14,

	UCOUNT_KABI_RESERVE15,

#endif

	UCOUNT_COUNTS,

};

kernel/ucount.c

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ static struct ctl_table user_table[] = { 
	UCOUNT_ENTRY("max_inotify_instances"),

	UCOUNT_ENTRY("max_inotify_watches"),

#endif

#ifdef CONFIG_KABI_RESERVE

	/* These corresponds to the reservation in enum ucount_type */

	{ }, // UCOUNT_KABI_RESERVE1

	{ }, // UCOUNT_KABI_RESERVE2
@@ -93,6 +94,7 @@ static struct ctl_table user_table[] = { 
	{ }, // UCOUNT_KABI_RESERVE13

	{ }, // UCOUNT_KABI_RESERVE14

	{ }, // UCOUNT_KABI_RESERVE15

#endif

	{ }

};

#endif /* CONFIG_SYSCTL */