Introduce SELinux hooks to support the access key retention subsystem within the kernel. Incorporate new flask headers from a modified version of the SELinux reference policy, with support for the new security class representing retained keys. Extend the "key_alloc" security hook with a task parameter representing the intended ownership context for the key being allocated. Attach security information to root's default keyrings within the SELinux initialization routine. Has passed David's testsuite.
Showing the changes to include (2 of 16 files). Show all
Unified · Split
| @@ -241,8 +241,9 @@ extern void unregister_key_type(struct key_type *ktype); · 240 unmodified lines | ||
| 241 | 241 | |
| 242 | 242 | extern struct key *key_alloc(struct key_type *type, |
| 243 | 243 | const char *desc, |
| 244 | − uid_t uid, gid_t gid, key_perm_t perm, | |
| 245 | − int not_in_quota); | |
| 244 | + uid_t uid, gid_t gid, | |
| 245 | + struct task_struct *ctx, | |
| 246 | + key_perm_t perm, int not_in_quota); | |
| 246 | 247 | extern int key_payload_reserve(struct key *key, size_t datalen); |
| 247 | 248 | extern int key_instantiate_and_link(struct key *key, |
| 248 | 249 | const void *data, |
| @@ -292,7 +293,9 @@ extern int key_unlink(struct key *keyring, · 43 unmodified lines | ||
| 292 | 293 | struct key *key); |
| 293 | 294 | |
| 294 | 295 | extern struct key *keyring_alloc(const char *description, uid_t uid, gid_t gid, |
| 295 | − int not_in_quota, struct key *dest); | |
| 296 | + struct task_struct *ctx, | |
| 297 | + int not_in_quota, | |
| 298 | + struct key *dest); | |
| 296 | 299 | |
| 297 | 300 | extern int keyring_clear(struct key *keyring); |
| 298 | 301 | |
| @@ -313,7 +316,8 @@ extern void keyring_replace_payload(struct key *key, void *replacement); · 14 unmodified lines | ||
| 313 | 316 | * the userspace interface |
| 314 | 317 | */ |
| 315 | 318 | extern struct key root_user_keyring, root_session_keyring; |
| 316 | −extern int alloc_uid_keyring(struct user_struct *user); | |
| 319 | +extern int alloc_uid_keyring(struct user_struct *user, | |
| 320 | + struct task_struct *ctx); | |
| 317 | 321 | extern void switch_uid_keyring(struct user_struct *new_user); |
| 318 | 322 | extern int copy_keys(unsigned long clone_flags, struct task_struct *tsk); |
| 319 | 323 | extern int copy_thread_group_keys(struct task_struct *tsk); |
| @@ -342,7 +346,7 @@ extern void key_init(void); · 22 unmodified lines | ||
| 342 | 346 | #define make_key_ref(k) ({ NULL; }) |
| 343 | 347 | #define key_ref_to_ptr(k) ({ NULL; }) |
| 344 | 348 | #define is_key_possessed(k) 0 |
| 345 | −#define alloc_uid_keyring(u) 0 | |
| 349 | +#define alloc_uid_keyring(u,c) 0 | |
| 346 | 350 | #define switch_uid_keyring(u) do { } while(0) |
| 347 | 351 | #define __install_session_keyring(t, k) ({ NULL; }) |
| 348 | 352 | #define copy_keys(f,t) 0 |
| @@ -355,6 +359,10 @@ extern void key_init(void); · 6 unmodified lines | ||
| 355 | 359 | #define key_fsgid_changed(t) do { } while(0) |
| 356 | 360 | #define key_init() do { } while(0) |
| 357 | 361 | |
| 362 | +/* Initial keyrings */ | |
| 363 | +extern struct key root_user_keyring; | |
| 364 | +extern struct key root_session_keyring; | |
| 365 | + | |
| 358 | 366 | #endif /* CONFIG_KEYS */ |
| 359 | 367 | #endif /* __KERNEL__ */ |
| 360 | 368 | #endif /* _LINUX_KEY_H */ |
| @@ -1313,7 +1313,7 @@ struct security_operations { · 1312 unmodified lines | ||
| 1313 | 1313 | |
| 1314 | 1314 | /* key management security hooks */ |
| 1315 | 1315 | #ifdef CONFIG_KEYS |
| 1316 | − int (*key_alloc)(struct key *key); | |
| 1316 | + int (*key_alloc)(struct key *key, struct task_struct *tsk); | |
| 1317 | 1317 | void (*key_free)(struct key *key); |
| 1318 | 1318 | int (*key_permission)(key_ref_t key_ref, |
| 1319 | 1319 | struct task_struct *context, |
| @@ -3008,9 +3008,10 @@ static inline int security_xfrm_policy_lookup(struct xfrm_policy *xp, u32 sk_sid · 1688 unmodified lines | ||
| 3008 | 3008 | |
| 3009 | 3009 | #ifdef CONFIG_KEYS |
| 3010 | 3010 | #ifdef CONFIG_SECURITY |
| 3011 | −static inline int security_key_alloc(struct key *key) | |
| 3011 | +static inline int security_key_alloc(struct key *key, | |
| 3012 | + struct task_struct *tsk) | |
| 3012 | 3013 | { |
| 3013 | − return security_ops->key_alloc(key); | |
| 3014 | + return security_ops->key_alloc(key, tsk); | |
| 3014 | 3015 | } |
| 3015 | 3016 | |
| 3016 | 3017 | static inline void security_key_free(struct key *key) |
| @@ -3027,7 +3028,8 @@ static inline int security_key_permission(key_ref_t key_ref, · 10 unmodified lines | ||
| 3027 | 3028 | |
| 3028 | 3029 | #else |
| 3029 | 3030 | |
| 3030 | −static inline int security_key_alloc(struct key *key) | |
| 3031 | +static inline int security_key_alloc(struct key *key, | |
| 3032 | + struct task_struct *tsk) | |
| 3031 | 3033 | { |
| 3032 | 3034 | return 0; |
| 3033 | 3035 | } |