diff options
author | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-01-30 22:23:26 -0500 |
---|---|---|
committer | Mimi Zohar <zohar@linux.vnet.ibm.com> | 2016-02-21 09:06:09 -0500 |
commit | 39eeb4fb97f60dbdfc823c1a673a8844b9226b60 (patch) | |
tree | 46e37e2211017237abd363a0dd1b3737da741ed0 /include | |
parent | e40ba6d56b41754b37b995dbc8035b2b3a6afd8a (diff) |
security: define kernel_read_file hook
The kernel_read_file security hook is called prior to reading the file
into memory.
Changelog v4+:
- export security_kernel_read_file()
Signed-off-by: Mimi Zohar <zohar@linux.vnet.ibm.com>
Acked-by: Kees Cook <keescook@chromium.org>
Acked-by: Luis R. Rodriguez <mcgrof@kernel.org>
Acked-by: Casey Schaufler <casey@schaufler-ca.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/ima.h | 6 | ||||
-rw-r--r-- | include/linux/lsm_hooks.h | 8 | ||||
-rw-r--r-- | include/linux/security.h | 7 |
3 files changed, 21 insertions, 0 deletions
diff --git a/include/linux/ima.h b/include/linux/ima.h index 7aea4863c244..6adcaea8101c 100644 --- a/include/linux/ima.h +++ b/include/linux/ima.h | |||
@@ -19,6 +19,7 @@ extern int ima_file_check(struct file *file, int mask, int opened); | |||
19 | extern void ima_file_free(struct file *file); | 19 | extern void ima_file_free(struct file *file); |
20 | extern int ima_file_mmap(struct file *file, unsigned long prot); | 20 | extern int ima_file_mmap(struct file *file, unsigned long prot); |
21 | extern int ima_module_check(struct file *file); | 21 | extern int ima_module_check(struct file *file); |
22 | extern int ima_read_file(struct file *file, enum kernel_read_file_id id); | ||
22 | extern int ima_post_read_file(struct file *file, void *buf, loff_t size, | 23 | extern int ima_post_read_file(struct file *file, void *buf, loff_t size, |
23 | enum kernel_read_file_id id); | 24 | enum kernel_read_file_id id); |
24 | 25 | ||
@@ -48,6 +49,11 @@ static inline int ima_module_check(struct file *file) | |||
48 | return 0; | 49 | return 0; |
49 | } | 50 | } |
50 | 51 | ||
52 | static inline int ima_read_file(struct file *file, enum kernel_read_file_id id) | ||
53 | { | ||
54 | return 0; | ||
55 | } | ||
56 | |||
51 | static inline int ima_post_read_file(struct file *file, void *buf, loff_t size, | 57 | static inline int ima_post_read_file(struct file *file, void *buf, loff_t size, |
52 | enum kernel_read_file_id id) | 58 | enum kernel_read_file_id id) |
53 | { | 59 | { |
diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h index 7d04a1220223..d32b7bd13635 100644 --- a/include/linux/lsm_hooks.h +++ b/include/linux/lsm_hooks.h | |||
@@ -552,6 +552,12 @@ | |||
552 | * the kernel module to load. If the module is being loaded from a blob, | 552 | * the kernel module to load. If the module is being loaded from a blob, |
553 | * this argument will be NULL. | 553 | * this argument will be NULL. |
554 | * Return 0 if permission is granted. | 554 | * Return 0 if permission is granted. |
555 | * @kernel_read_file: | ||
556 | * Read a file specified by userspace. | ||
557 | * @file contains the file structure pointing to the file being read | ||
558 | * by the kernel. | ||
559 | * @id kernel read file identifier | ||
560 | * Return 0 if permission is granted. | ||
555 | * @kernel_post_read_file: | 561 | * @kernel_post_read_file: |
556 | * Read a file specified by userspace. | 562 | * Read a file specified by userspace. |
557 | * @file contains the file structure pointing to the file being read | 563 | * @file contains the file structure pointing to the file being read |
@@ -1455,6 +1461,7 @@ union security_list_options { | |||
1455 | int (*kernel_create_files_as)(struct cred *new, struct inode *inode); | 1461 | int (*kernel_create_files_as)(struct cred *new, struct inode *inode); |
1456 | int (*kernel_module_request)(char *kmod_name); | 1462 | int (*kernel_module_request)(char *kmod_name); |
1457 | int (*kernel_module_from_file)(struct file *file); | 1463 | int (*kernel_module_from_file)(struct file *file); |
1464 | int (*kernel_read_file)(struct file *file, enum kernel_read_file_id id); | ||
1458 | int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size, | 1465 | int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size, |
1459 | enum kernel_read_file_id id); | 1466 | enum kernel_read_file_id id); |
1460 | int (*task_fix_setuid)(struct cred *new, const struct cred *old, | 1467 | int (*task_fix_setuid)(struct cred *new, const struct cred *old, |
@@ -1715,6 +1722,7 @@ struct security_hook_heads { | |||
1715 | struct list_head cred_transfer; | 1722 | struct list_head cred_transfer; |
1716 | struct list_head kernel_act_as; | 1723 | struct list_head kernel_act_as; |
1717 | struct list_head kernel_create_files_as; | 1724 | struct list_head kernel_create_files_as; |
1725 | struct list_head kernel_read_file; | ||
1718 | struct list_head kernel_post_read_file; | 1726 | struct list_head kernel_post_read_file; |
1719 | struct list_head kernel_module_request; | 1727 | struct list_head kernel_module_request; |
1720 | struct list_head kernel_module_from_file; | 1728 | struct list_head kernel_module_from_file; |
diff --git a/include/linux/security.h b/include/linux/security.h index cee1349e1155..071fb747fdbb 100644 --- a/include/linux/security.h +++ b/include/linux/security.h | |||
@@ -302,6 +302,7 @@ int security_kernel_act_as(struct cred *new, u32 secid); | |||
302 | int security_kernel_create_files_as(struct cred *new, struct inode *inode); | 302 | int security_kernel_create_files_as(struct cred *new, struct inode *inode); |
303 | int security_kernel_module_request(char *kmod_name); | 303 | int security_kernel_module_request(char *kmod_name); |
304 | int security_kernel_module_from_file(struct file *file); | 304 | int security_kernel_module_from_file(struct file *file); |
305 | int security_kernel_read_file(struct file *file, enum kernel_read_file_id id); | ||
305 | int security_kernel_post_read_file(struct file *file, char *buf, loff_t size, | 306 | int security_kernel_post_read_file(struct file *file, char *buf, loff_t size, |
306 | enum kernel_read_file_id id); | 307 | enum kernel_read_file_id id); |
307 | int security_task_fix_setuid(struct cred *new, const struct cred *old, | 308 | int security_task_fix_setuid(struct cred *new, const struct cred *old, |
@@ -863,6 +864,12 @@ static inline int security_kernel_module_from_file(struct file *file) | |||
863 | return 0; | 864 | return 0; |
864 | } | 865 | } |
865 | 866 | ||
867 | static inline int security_kernel_read_file(struct file *file, | ||
868 | enum kernel_read_file_id id) | ||
869 | { | ||
870 | return 0; | ||
871 | } | ||
872 | |||
866 | static inline int security_kernel_post_read_file(struct file *file, | 873 | static inline int security_kernel_post_read_file(struct file *file, |
867 | char *buf, loff_t size, | 874 | char *buf, loff_t size, |
868 | enum kernel_read_file_id id) | 875 | enum kernel_read_file_id id) |