On Sat, Jul 9, 2016 at 2:19 PM, Mickaël Salaün <[email protected]> wrote: > Fixes: a1db74209483 ("module: replace copy_module_from_fd with kernel > version")
Oh, hrm, was that still in there? Thanks for the catch! Acked-by: Kees Cook <[email protected]> -Kees > > Signed-off-by: Mickaël Salaün <[email protected]> > Cc: Mimi Zohar <[email protected]> > Cc: Kees Cook <[email protected]> > Cc: Luis R. Rodriguez <[email protected]> > Cc: Rusty Russell <[email protected]> > Cc: Linus Torvalds <[email protected]> > Cc: Greg Kroah-Hartman <[email protected]> > --- > include/linux/lsm_hooks.h | 1 - > include/linux/security.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > index 7ae397669d8b..58c777ec8bcf 100644 > --- a/include/linux/lsm_hooks.h > +++ b/include/linux/lsm_hooks.h > @@ -1455,7 +1455,6 @@ union security_list_options { > int (*kernel_act_as)(struct cred *new, u32 secid); > int (*kernel_create_files_as)(struct cred *new, struct inode *inode); > 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_post_read_file)(struct file *file, char *buf, loff_t > size, > enum kernel_read_file_id id); > diff --git a/include/linux/security.h b/include/linux/security.h > index 14df373ff2ca..2b8c7d2a3fd8 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -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_create_files_as(struct cred *new, struct inode *inode); > 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_post_read_file(struct file *file, char *buf, loff_t size, > enum kernel_read_file_id id); > -- > 2.8.1 > -- Kees Cook Chrome OS & Brillo Security
