From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751242AbeFDT7y (ORCPT ); Mon, 4 Jun 2018 15:59:54 -0400 Received: from h2.hallyn.com ([78.46.35.8]:56582 "EHLO mail.hallyn.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751093AbeFDT7w (ORCPT ); Mon, 4 Jun 2018 15:59:52 -0400 Date: Mon, 4 Jun 2018 14:59:50 -0500 From: "Serge E. Hallyn" To: Mimi Zohar Cc: linux-integrity@vger.kernel.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , "Luis R . Rodriguez" , Eric Biederman , kexec@lists.infradead.org, Andres Rodriguez , Greg Kroah-Hartman , Ard Biesheuvel , Kees Cook , Casey Schaufler Subject: Re: [PATCH v4 1/8] security: define new LSM hook named security_kernel_load_data Message-ID: <20180604195950.GB14454@mail.hallyn.com> References: <1527616920-5415-1-git-send-email-zohar@linux.vnet.ibm.com> <1527616920-5415-2-git-send-email-zohar@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1527616920-5415-2-git-send-email-zohar@linux.vnet.ibm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Quoting Mimi Zohar (zohar@linux.vnet.ibm.com): > Differentiate between the kernel reading a file from the kernel loading > data provided by userspace. This patch defines a new LSM hook named > security_kernel_load_data. > > Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn > Cc: Eric Biederman > Cc: Luis R. Rodriguez > Cc: Kees Cook > Cc: David Howells > Cc: Casey Schaufler > > Changelog v4: > - Define new LSM hook named security_kernel_load_data. > > Changelog v3: > - Rename security_kernel_read_file to security_kernel_read_data(). > > Changelog v2: > - Define a generic wrapper named security_kernel_read_blob() for > security_kernel_read_file(). > > Changelog v1: > - Define and call security_kexec_load(), a wrapper for > security_kernel_read_file(). > --- > include/linux/lsm_hooks.h | 6 ++++++ > include/linux/security.h | 33 +++++++++++++++++++++++++++++++++ > security/security.c | 5 +++++ > 3 files changed, 44 insertions(+) > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > index 8f1131c8dd54..a08bc2587b96 100644 > --- a/include/linux/lsm_hooks.h > +++ b/include/linux/lsm_hooks.h > @@ -576,6 +576,10 @@ > * userspace to load a kernel module with the given name. > * @kmod_name name of the module requested by the kernel > * Return 0 if successful. > + * @kernel_load_data: > + * Load data provided by userspace. > + * @id kernel load data identifier > + * Return 0 if permission is granted. > * @kernel_read_file: > * Read a file specified by userspace. > * @file contains the file structure pointing to the file being read > @@ -1582,6 +1586,7 @@ 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_load_data)(enum kernel_load_data_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, > enum kernel_read_file_id id); > @@ -1872,6 +1877,7 @@ struct security_hook_heads { > struct hlist_head cred_getsecid; > struct hlist_head kernel_act_as; > struct hlist_head kernel_create_files_as; > + struct hlist_head kernel_load_data; > struct hlist_head kernel_read_file; > struct hlist_head kernel_post_read_file; > struct hlist_head kernel_module_request; > diff --git a/include/linux/security.h b/include/linux/security.h > index 63030c85ee19..3d54d5945755 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -159,6 +159,33 @@ extern int mmap_min_addr_handler(struct ctl_table *table, int write, > typedef int (*initxattrs) (struct inode *inode, > const struct xattr *xattr_array, void *fs_data); > > + > +#define __kernel_load_data_id(id) \ > + id(UNKNOWN, unknown) \ > + id(FIRMWARE, firmware) \ > + id(MODULE, kernel-module) \ > + id(KEXEC_IMAGE, kexec-image) \ > + id(MAX_ID, ) > + > +#define __data_id_enumify(ENUM, dummy) LOADING_ ## ENUM, > +#define __data_id_stringify(dummy, str) #str, > + > +enum kernel_load_data_id { > + __kernel_load_data_id(__data_id_enumify) > +}; > + > +static const char * const kernel_load_data_str[] = { > + __kernel_load_data_id(__data_id_stringify) > +}; > + > +static inline const char *kernel_load_data_id_str(enum kernel_load_data_id id) > +{ > + if ((unsigned)id >= LOADING_MAX_ID) > + return kernel_load_data_str[LOADING_UNKNOWN]; > + > + return kernel_load_data_str[id]; > +} > + > #ifdef CONFIG_SECURITY > > struct security_mnt_opts { > @@ -320,6 +347,7 @@ void security_cred_getsecid(const struct cred *c, 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_module_request(char *kmod_name); > +int security_kernel_load_data(enum kernel_load_data_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, > enum kernel_read_file_id id); > @@ -909,6 +937,11 @@ static inline int security_kernel_module_request(char *kmod_name) > return 0; > } > > +static inline int security_kernel_load_data(enum kernel_load_data_id id) > +{ > + return 0; > +} > + > static inline int security_kernel_read_file(struct file *file, > enum kernel_read_file_id id) > { > diff --git a/security/security.c b/security/security.c > index 68f46d849abe..c2de2f134854 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -1056,6 +1056,11 @@ int security_kernel_post_read_file(struct file *file, char *buf, loff_t size, > } > EXPORT_SYMBOL_GPL(security_kernel_post_read_file); > > +int security_kernel_load_data(enum kernel_load_data_id id) > +{ > + return call_int_hook(kernel_load_data, 0, id); > +} > + > int security_task_fix_setuid(struct cred *new, const struct cred *old, > int flags) > { > -- > 2.7.5 From mboxrd@z Thu Jan 1 00:00:00 1970 From: serge@hallyn.com (Serge E. Hallyn) Date: Mon, 4 Jun 2018 14:59:50 -0500 Subject: [PATCH v4 1/8] security: define new LSM hook named security_kernel_load_data In-Reply-To: <1527616920-5415-2-git-send-email-zohar@linux.vnet.ibm.com> References: <1527616920-5415-1-git-send-email-zohar@linux.vnet.ibm.com> <1527616920-5415-2-git-send-email-zohar@linux.vnet.ibm.com> Message-ID: <20180604195950.GB14454@mail.hallyn.com> To: linux-security-module@vger.kernel.org List-Id: linux-security-module.vger.kernel.org Quoting Mimi Zohar (zohar at linux.vnet.ibm.com): > Differentiate between the kernel reading a file from the kernel loading > data provided by userspace. This patch defines a new LSM hook named > security_kernel_load_data. > > Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn > Cc: Eric Biederman > Cc: Luis R. Rodriguez > Cc: Kees Cook > Cc: David Howells > Cc: Casey Schaufler > > Changelog v4: > - Define new LSM hook named security_kernel_load_data. > > Changelog v3: > - Rename security_kernel_read_file to security_kernel_read_data(). > > Changelog v2: > - Define a generic wrapper named security_kernel_read_blob() for > security_kernel_read_file(). > > Changelog v1: > - Define and call security_kexec_load(), a wrapper for > security_kernel_read_file(). > --- > include/linux/lsm_hooks.h | 6 ++++++ > include/linux/security.h | 33 +++++++++++++++++++++++++++++++++ > security/security.c | 5 +++++ > 3 files changed, 44 insertions(+) > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > index 8f1131c8dd54..a08bc2587b96 100644 > --- a/include/linux/lsm_hooks.h > +++ b/include/linux/lsm_hooks.h > @@ -576,6 +576,10 @@ > * userspace to load a kernel module with the given name. > * @kmod_name name of the module requested by the kernel > * Return 0 if successful. > + * @kernel_load_data: > + * Load data provided by userspace. > + * @id kernel load data identifier > + * Return 0 if permission is granted. > * @kernel_read_file: > * Read a file specified by userspace. > * @file contains the file structure pointing to the file being read > @@ -1582,6 +1586,7 @@ 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_load_data)(enum kernel_load_data_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, > enum kernel_read_file_id id); > @@ -1872,6 +1877,7 @@ struct security_hook_heads { > struct hlist_head cred_getsecid; > struct hlist_head kernel_act_as; > struct hlist_head kernel_create_files_as; > + struct hlist_head kernel_load_data; > struct hlist_head kernel_read_file; > struct hlist_head kernel_post_read_file; > struct hlist_head kernel_module_request; > diff --git a/include/linux/security.h b/include/linux/security.h > index 63030c85ee19..3d54d5945755 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -159,6 +159,33 @@ extern int mmap_min_addr_handler(struct ctl_table *table, int write, > typedef int (*initxattrs) (struct inode *inode, > const struct xattr *xattr_array, void *fs_data); > > + > +#define __kernel_load_data_id(id) \ > + id(UNKNOWN, unknown) \ > + id(FIRMWARE, firmware) \ > + id(MODULE, kernel-module) \ > + id(KEXEC_IMAGE, kexec-image) \ > + id(MAX_ID, ) > + > +#define __data_id_enumify(ENUM, dummy) LOADING_ ## ENUM, > +#define __data_id_stringify(dummy, str) #str, > + > +enum kernel_load_data_id { > + __kernel_load_data_id(__data_id_enumify) > +}; > + > +static const char * const kernel_load_data_str[] = { > + __kernel_load_data_id(__data_id_stringify) > +}; > + > +static inline const char *kernel_load_data_id_str(enum kernel_load_data_id id) > +{ > + if ((unsigned)id >= LOADING_MAX_ID) > + return kernel_load_data_str[LOADING_UNKNOWN]; > + > + return kernel_load_data_str[id]; > +} > + > #ifdef CONFIG_SECURITY > > struct security_mnt_opts { > @@ -320,6 +347,7 @@ void security_cred_getsecid(const struct cred *c, 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_module_request(char *kmod_name); > +int security_kernel_load_data(enum kernel_load_data_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, > enum kernel_read_file_id id); > @@ -909,6 +937,11 @@ static inline int security_kernel_module_request(char *kmod_name) > return 0; > } > > +static inline int security_kernel_load_data(enum kernel_load_data_id id) > +{ > + return 0; > +} > + > static inline int security_kernel_read_file(struct file *file, > enum kernel_read_file_id id) > { > diff --git a/security/security.c b/security/security.c > index 68f46d849abe..c2de2f134854 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -1056,6 +1056,11 @@ int security_kernel_post_read_file(struct file *file, char *buf, loff_t size, > } > EXPORT_SYMBOL_GPL(security_kernel_post_read_file); > > +int security_kernel_load_data(enum kernel_load_data_id id) > +{ > + return call_int_hook(kernel_load_data, 0, id); > +} > + > int security_task_fix_setuid(struct cred *new, const struct cred *old, > int flags) > { > -- > 2.7.5 -- To unsubscribe from this list: send the line "unsubscribe linux-security-module" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from h2.hallyn.com ([78.46.35.8] helo=mail.hallyn.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fPve6-0005Mp-JI for kexec@lists.infradead.org; Mon, 04 Jun 2018 20:00:41 +0000 Date: Mon, 4 Jun 2018 14:59:50 -0500 From: "Serge E. Hallyn" Subject: Re: [PATCH v4 1/8] security: define new LSM hook named security_kernel_load_data Message-ID: <20180604195950.GB14454@mail.hallyn.com> References: <1527616920-5415-1-git-send-email-zohar@linux.vnet.ibm.com> <1527616920-5415-2-git-send-email-zohar@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1527616920-5415-2-git-send-email-zohar@linux.vnet.ibm.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "kexec" Errors-To: kexec-bounces+dwmw2=infradead.org@lists.infradead.org To: Mimi Zohar Cc: Kees Cook , Ard Biesheuvel , Greg Kroah-Hartman , kexec@lists.infradead.org, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, David Howells , "Luis R . Rodriguez" , Eric Biederman , Casey Schaufler , linux-integrity@vger.kernel.org, Andres Rodriguez Quoting Mimi Zohar (zohar@linux.vnet.ibm.com): > Differentiate between the kernel reading a file from the kernel loading > data provided by userspace. This patch defines a new LSM hook named > security_kernel_load_data. > > Signed-off-by: Mimi Zohar Acked-by: Serge Hallyn > Cc: Eric Biederman > Cc: Luis R. Rodriguez > Cc: Kees Cook > Cc: David Howells > Cc: Casey Schaufler > > Changelog v4: > - Define new LSM hook named security_kernel_load_data. > > Changelog v3: > - Rename security_kernel_read_file to security_kernel_read_data(). > > Changelog v2: > - Define a generic wrapper named security_kernel_read_blob() for > security_kernel_read_file(). > > Changelog v1: > - Define and call security_kexec_load(), a wrapper for > security_kernel_read_file(). > --- > include/linux/lsm_hooks.h | 6 ++++++ > include/linux/security.h | 33 +++++++++++++++++++++++++++++++++ > security/security.c | 5 +++++ > 3 files changed, 44 insertions(+) > > diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h > index 8f1131c8dd54..a08bc2587b96 100644 > --- a/include/linux/lsm_hooks.h > +++ b/include/linux/lsm_hooks.h > @@ -576,6 +576,10 @@ > * userspace to load a kernel module with the given name. > * @kmod_name name of the module requested by the kernel > * Return 0 if successful. > + * @kernel_load_data: > + * Load data provided by userspace. > + * @id kernel load data identifier > + * Return 0 if permission is granted. > * @kernel_read_file: > * Read a file specified by userspace. > * @file contains the file structure pointing to the file being read > @@ -1582,6 +1586,7 @@ 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_load_data)(enum kernel_load_data_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, > enum kernel_read_file_id id); > @@ -1872,6 +1877,7 @@ struct security_hook_heads { > struct hlist_head cred_getsecid; > struct hlist_head kernel_act_as; > struct hlist_head kernel_create_files_as; > + struct hlist_head kernel_load_data; > struct hlist_head kernel_read_file; > struct hlist_head kernel_post_read_file; > struct hlist_head kernel_module_request; > diff --git a/include/linux/security.h b/include/linux/security.h > index 63030c85ee19..3d54d5945755 100644 > --- a/include/linux/security.h > +++ b/include/linux/security.h > @@ -159,6 +159,33 @@ extern int mmap_min_addr_handler(struct ctl_table *table, int write, > typedef int (*initxattrs) (struct inode *inode, > const struct xattr *xattr_array, void *fs_data); > > + > +#define __kernel_load_data_id(id) \ > + id(UNKNOWN, unknown) \ > + id(FIRMWARE, firmware) \ > + id(MODULE, kernel-module) \ > + id(KEXEC_IMAGE, kexec-image) \ > + id(MAX_ID, ) > + > +#define __data_id_enumify(ENUM, dummy) LOADING_ ## ENUM, > +#define __data_id_stringify(dummy, str) #str, > + > +enum kernel_load_data_id { > + __kernel_load_data_id(__data_id_enumify) > +}; > + > +static const char * const kernel_load_data_str[] = { > + __kernel_load_data_id(__data_id_stringify) > +}; > + > +static inline const char *kernel_load_data_id_str(enum kernel_load_data_id id) > +{ > + if ((unsigned)id >= LOADING_MAX_ID) > + return kernel_load_data_str[LOADING_UNKNOWN]; > + > + return kernel_load_data_str[id]; > +} > + > #ifdef CONFIG_SECURITY > > struct security_mnt_opts { > @@ -320,6 +347,7 @@ void security_cred_getsecid(const struct cred *c, 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_module_request(char *kmod_name); > +int security_kernel_load_data(enum kernel_load_data_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, > enum kernel_read_file_id id); > @@ -909,6 +937,11 @@ static inline int security_kernel_module_request(char *kmod_name) > return 0; > } > > +static inline int security_kernel_load_data(enum kernel_load_data_id id) > +{ > + return 0; > +} > + > static inline int security_kernel_read_file(struct file *file, > enum kernel_read_file_id id) > { > diff --git a/security/security.c b/security/security.c > index 68f46d849abe..c2de2f134854 100644 > --- a/security/security.c > +++ b/security/security.c > @@ -1056,6 +1056,11 @@ int security_kernel_post_read_file(struct file *file, char *buf, loff_t size, > } > EXPORT_SYMBOL_GPL(security_kernel_post_read_file); > > +int security_kernel_load_data(enum kernel_load_data_id id) > +{ > + return call_int_hook(kernel_load_data, 0, id); > +} > + > int security_task_fix_setuid(struct cred *new, const struct cred *old, > int flags) > { > -- > 2.7.5 _______________________________________________ kexec mailing list kexec@lists.infradead.org http://lists.infradead.org/mailman/listinfo/kexec