Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1765201AbYBZX1U (ORCPT ); Tue, 26 Feb 2008 18:27:20 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1760762AbYBZX1K (ORCPT ); Tue, 26 Feb 2008 18:27:10 -0500 Received: from ug-out-1314.google.com ([66.249.92.175]:22376 "EHLO ug-out-1314.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754675AbYBZX1J (ORCPT ); Tue, 26 Feb 2008 18:27:09 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:to:cc:subject:message-id:references:mime-version:content-type:content-disposition:in-reply-to:user-agent:from; b=GUNcBdgpQvslXtr7fesTu+CQWMdT4A8UFSMrkhmk+HIYAS22KgYVTQvKOcqpttw46wZTi2M3VHm1WJ3jr5mNGUz50QkXAGXGsr3B6fqORNYGl7P0WYPvIM4Ge3CnH4ezJGmCji2/efu7XyS5A5RcllEJGDQsDXm5qN29QDOwFbM= Date: Wed, 27 Feb 2008 01:24:11 +0200 To: Chris Wright , Stephen Smalley , James Morris , Eric Paris , Casey Schaufler , David Woodhouse Cc: linux-security-module@vger.kernel.org, LKML , akpm Subject: [PATCH -mm 1/4] LSM: Introduce inode_getsecid and ipc_getsecid hooks Message-ID: <20080226232411.GB12059@ubuntu> References: <20080226232229.GA12059@ubuntu> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20080226232229.GA12059@ubuntu> User-Agent: Mutt/1.5.15+20070412 (2007-04-11) From: "Ahmed S. Darwish" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7087 Lines: 181 Introduce inode_getsecid(inode, secid) and ipc_getsecid(ipcp, secid) LSM hooks. This hooks will be used instead of similar exported SELinux interfaces. Signed-off-by: Casey Schaufler Signed-off-by: Ahmed S. Darwish --- include/linux/security.h | 18 ++++++++++++++++++ security/dummy.c | 12 ++++++++++++ security/security.c | 12 ++++++++++++ 3 files changed, 42 insertions(+) diff --git a/include/linux/security.h b/include/linux/security.h index a33fd03..a7fb136 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -449,6 +449,10 @@ struct request_sock; * @dentry is the dentry being changed. * Return 0 on success. If error is returned, then the operation * causing setuid bit removal is failed. + * @inode_getsecid: + * Get the secid associated with the node + * @inode contains a pointer to the inode + * @secid contains a pointer to the location to store the result * * Security hooks for file operations * @@ -989,6 +993,10 @@ struct request_sock; * @ipcp contains the kernel IPC permission structure * @flag contains the desired (requested) permission set * Return 0 if permission is granted. + * @ipc_getsecid: + * Get the secid associated with the ipc object + * @ipcp contains the kernel IPC permission structure + * @secid contains a pointer to the location where result will be saved * * Security hooks for individual messages held in System V IPC message queues * @msg_msg_alloc_security: @@ -1310,6 +1318,7 @@ struct security_operations { int (*inode_getsecurity)(const struct inode *inode, const char *name, void **buffer, bool alloc); int (*inode_setsecurity)(struct inode *inode, const char *name, const void *value, size_t size, int flags); int (*inode_listsecurity)(struct inode *inode, char *buffer, size_t buffer_size); + void (*inode_getsecid)(const struct inode *inode, u32 *secid); int (*file_permission) (struct file * file, int mask); int (*file_alloc_security) (struct file * file); @@ -1362,6 +1371,7 @@ struct security_operations { void (*task_to_inode)(struct task_struct *p, struct inode *inode); int (*ipc_permission) (struct kern_ipc_perm * ipcp, short flag); + void (*ipc_getsecid) (struct kern_ipc_perm *ipcp, u32 *secid); int (*msg_msg_alloc_security) (struct msg_msg * msg); void (*msg_msg_free_security) (struct msg_msg * msg); @@ -1571,6 +1581,7 @@ int security_inode_killpriv(struct dentry *dentry); int security_inode_getsecurity(const struct inode *inode, const char *name, void **buffer, bool alloc); int security_inode_setsecurity(struct inode *inode, const char *name, const void *value, size_t size, int flags); int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer_size); +void security_inode_getsecid(const struct inode *inode, u32 *secid); int security_file_permission(struct file *file, int mask); int security_file_alloc(struct file *file); void security_file_free(struct file *file); @@ -1615,6 +1626,7 @@ int security_task_prctl(int option, unsigned long arg2, unsigned long arg3, void security_task_reparent_to_init(struct task_struct *p); void security_task_to_inode(struct task_struct *p, struct inode *inode); int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag); +void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid); int security_msg_msg_alloc(struct msg_msg *msg); void security_msg_msg_free(struct msg_msg *msg); int security_msg_queue_alloc(struct msg_queue *msq); @@ -1985,6 +1997,9 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer, return 0; } +static inline void security_inode_getsecid(const struct inode *inode, u32 *secid) +{ } + static inline int security_file_permission (struct file *file, int mask) { return 0; @@ -2179,6 +2194,9 @@ static inline int security_ipc_permission (struct kern_ipc_perm *ipcp, return 0; } +static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid) +{ } + static inline int security_msg_msg_alloc (struct msg_msg * msg) { return 0; diff --git a/security/dummy.c b/security/dummy.c index 6a0056b..c2f4c52 100644 --- a/security/dummy.c +++ b/security/dummy.c @@ -422,6 +422,11 @@ static int dummy_inode_listsecurity(struct inode *inode, char *buffer, size_t bu return 0; } +static void dummy_inode_getsecid(const struct inode *inode, u32 *secid) +{ + return; +} + static int dummy_file_permission (struct file *file, int mask) { return 0; @@ -614,6 +619,11 @@ static int dummy_ipc_permission (struct kern_ipc_perm *ipcp, short flag) return 0; } +static void dummy_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid) +{ + return; +} + static int dummy_msg_msg_alloc_security (struct msg_msg *msg) { return 0; @@ -1062,6 +1072,7 @@ void security_fixup_ops (struct security_operations *ops) set_to_dummy_if_null(ops, inode_getsecurity); set_to_dummy_if_null(ops, inode_setsecurity); set_to_dummy_if_null(ops, inode_listsecurity); + set_to_dummy_if_null(ops, inode_getsecid); set_to_dummy_if_null(ops, file_permission); set_to_dummy_if_null(ops, file_alloc_security); set_to_dummy_if_null(ops, file_free_security); @@ -1098,6 +1109,7 @@ void security_fixup_ops (struct security_operations *ops) set_to_dummy_if_null(ops, task_reparent_to_init); set_to_dummy_if_null(ops, task_to_inode); set_to_dummy_if_null(ops, ipc_permission); + set_to_dummy_if_null(ops, ipc_getsecid); set_to_dummy_if_null(ops, msg_msg_alloc_security); set_to_dummy_if_null(ops, msg_msg_free_security); set_to_dummy_if_null(ops, msg_queue_alloc_security); diff --git a/security/security.c b/security/security.c index 3e75b90..fcf2be3 100644 --- a/security/security.c +++ b/security/security.c @@ -516,6 +516,12 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer return security_ops->inode_listsecurity(inode, buffer, buffer_size); } +void security_inode_getsecid(const struct inode *inode, u32 *secid) +{ + security_ops->inode_getsecid(inode, secid); +} +EXPORT_SYMBOL(security_inode_getsecid); + int security_file_permission(struct file *file, int mask) { return security_ops->file_permission(file, mask); @@ -705,6 +711,12 @@ int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag) return security_ops->ipc_permission(ipcp, flag); } +void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid) +{ + security_ops->ipc_getsecid(ipcp, secid); +} +EXPORT_SYMBOL(security_ipc_getsecid); + int security_msg_msg_alloc(struct msg_msg *msg) { return security_ops->msg_msg_alloc_security(msg); -- "Better to light a candle, than curse the darkness" Ahmed S. Darwish Homepage: http://darwish.07.googlepages.com Blog: http://darwish-07.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/