移去rt

hc

2023-12-08 01573e231f18eb2d99162747186f59511f56b64d

 kernel/include/linux/user_namespace.h
..
..
@@ -46,6 +46,7 @@
46
46
 	UCOUNT_NET_NAMESPACES,
47
47
 	UCOUNT_MNT_NAMESPACES,
48
48
 	UCOUNT_CGROUP_NAMESPACES,
49
+	UCOUNT_TIME_NAMESPACES,
49
50
 #ifdef CONFIG_INOTIFY_USER
50
51
 	UCOUNT_INOTIFY_INSTANCES,
51
52
 	UCOUNT_INOTIFY_WATCHES,
..
..
@@ -64,11 +65,24 @@
64
65
 	kgid_t			group;
65
66
 	struct ns_common	ns;
66
67
 	unsigned long		flags;
68
+	/* parent_could_setfcap: true if the creator if this ns had CAP_SETFCAP
69
+	 * in its effective capability set at the child ns creation time. */
70
+	bool			parent_could_setfcap;
71
+
72
+#ifdef CONFIG_KEYS
73
+	/* List of joinable keyrings in this namespace.  Modification access of
74
+	 * these pointers is controlled by keyring_sem.  Once
75
+	 * user_keyring_register is set, it won't be changed, so it can be
76
+	 * accessed directly with READ_ONCE().
77
+	 */
78
+	struct list_head	keyring_name_list;
79
+	struct key		*user_keyring_register;
80
+	struct rw_semaphore	keyring_sem;
81
+#endif
67
82
 
68
83
 	/* Register of per-UID persistent keyrings for this namespace */
69
84
 #ifdef CONFIG_PERSISTENT_KEYRINGS
70
85
 	struct key		*persistent_keyring_register;
71
-	struct rw_semaphore	persistent_keyring_register_sem;
72
86
 #endif
73
87
 	struct work_struct	work;
74
88
 #ifdef CONFIG_SYSCTL