Commit a4f4528a authored by Mickaël Salaün's avatar Mickaël Salaün Committed by James Morris
Browse files

module: Fully remove the kernel_module_from_file hook 



Remove remaining kernel_module_from_file hook left by commit
a1db7420 ("module: replace copy_module_from_fd with kernel version")

Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Acked-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarMimi Zohar <zohar@linux.vnet.ibm.com>
Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
parent 29b4817d

include/linux/lsm_hooks.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -1455,7 +1455,6 @@ union security_list_options { 
	int (*kernel_act_as)(struct cred *new, u32 secid);

	int (*kernel_act_as)(struct cred *new, u32 secid);

	int (*kernel_create_files_as)(struct cred *new, struct inode *inode);

	int (*kernel_create_files_as)(struct cred *new, struct inode *inode);

	int (*kernel_module_request)(char *kmod_name);

	int (*kernel_module_request)(char *kmod_name);

	int (*kernel_module_from_file)(struct file *file);

	int (*kernel_read_file)(struct file *file, enum kernel_read_file_id id);

	int (*kernel_read_file)(struct file *file, enum kernel_read_file_id id);

	int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size,

	int (*kernel_post_read_file)(struct file *file, char *buf, loff_t size,

				     enum kernel_read_file_id id);

				     enum kernel_read_file_id id);

include/linux/security.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -307,7 +307,6 @@ void security_transfer_creds(struct cred *new, const struct cred *old); 
int security_kernel_act_as(struct cred *new, u32 secid);

int security_kernel_act_as(struct cred *new, u32 secid);

int security_kernel_create_files_as(struct cred *new, struct inode *inode);

int security_kernel_create_files_as(struct cred *new, struct inode *inode);

int security_kernel_module_request(char *kmod_name);

int security_kernel_module_request(char *kmod_name);

int security_kernel_module_from_file(struct file *file);

int security_kernel_read_file(struct file *file, enum kernel_read_file_id id);

int security_kernel_read_file(struct file *file, enum kernel_read_file_id id);

int security_kernel_post_read_file(struct file *file, char *buf, loff_t size,

int security_kernel_post_read_file(struct file *file, char *buf, loff_t size,

				   enum kernel_read_file_id id);

				   enum kernel_read_file_id id);

CRA Git | Maintained and supported by SUSTech CRA and CCSE