Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1439981 > unrolled thread

[PATCH v1] module: Fully remove the kernel_module_from_file hook

Back to article view | Back to linux.kernel

Contents

  [PATCH v1] module: Fully remove the kernel_module_from_file hook Mickaël Salaün <mic@digikod.net> - 2016-07-09 22:50 +0200
    Re: [PATCH v1] module: Fully remove the kernel_module_from_file hook Kees Cook <keescook@chromium.org> - 2016-07-11 20:50 +0200
    Re: [PATCH v1] module: Fully remove the kernel_module_from_file hook Greg Kroah-Hartman <gregkh@linuxfoundation.org> - 2016-07-12 01:10 +0200
    Re: [PATCH v1] module: Fully remove the kernel_module_from_file  hook James Morris <jmorris@namei.org> - 2016-07-12 15:00 +0200

#1439981 — [PATCH v1] module: Fully remove the kernel_module_from_file hook

Fixes: a1db74209483 ("module: replace copy_module_from_fd with kernel version")

Signed-off-by: Mickaël Salaün <mic@digikod.net>
Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
Cc: Kees Cook <keescook@chromium.org>
Cc: Luis R. Rodriguez <mcgrof@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 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

[toc] | [next] | [standalone]

#1440816

On Sat, Jul 9, 2016 at 2:19 PM, Mickaël Salaün <mic@digikod.net> 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 <keescook@chromium.org>

-Kees

>
> Signed-off-by: Mickaël Salaün <mic@digikod.net>
> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Luis R. Rodriguez <mcgrof@kernel.org>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> ---
>  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

[toc] | [prev] | [next] | [standalone]

#1440966

On Sat, Jul 09, 2016 at 08:19:15PM +0200, Mickaël Salaün wrote:
> Fixes: a1db74209483 ("module: replace copy_module_from_fd with kernel version")

It's not a "fix", it's a "cleanup remaining bits"

[toc] | [prev] | [next] | [standalone]

#1441329 — Re: [PATCH v1] module: Fully remove the kernel_module_from_file hook

[Multipart message — attachments visible in raw view] — view raw

On Sat, 9 Jul 2016, Mickaël Salaün wrote:

> Fixes: a1db74209483 ("module: replace copy_module_from_fd with kernel version")
> 
> Signed-off-by: Mickaël Salaün <mic@digikod.net>
> Cc: Mimi Zohar <zohar@linux.vnet.ibm.com>
> Cc: Kees Cook <keescook@chromium.org>
> Cc: Luis R. Rodriguez <mcgrof@kernel.org>
> Cc: Rusty Russell <rusty@rustcorp.com.au>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>


Acked-by: James Morris <james.l.morris@oracle.com>

-- 
James Morris
<jmorris@namei.org>

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web