Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8a076191 authored by Ahmed S. Darwish's avatar Ahmed S. Darwish Committed by James Morris
Browse files

LSM: Introduce inode_getsecid and ipc_getsecid hooks 



Introduce inode_getsecid(inode, secid) and ipc_getsecid(ipcp, secid)
LSM hooks. These hooks will be used instead of similar exported
SELinux interfaces.

Let {inode,ipc,task}_getsecid hooks set the secid to 0 by default
if CONFIG_SECURITY is not defined or if the hook is set to
NULL (dummy). This is done to notify the caller that no valid
secid exists.

Signed-off-by: default avatarCasey Schaufler <casey@schaufler-ca.com>
Signed-off-by: default avatarAhmed S. Darwish <darwish.07@gmail.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Reviewed-by: default avatarPaul Moore <paul.moore@hp.com>
parent d1a4be63

include/linux/security.h

+29 −1
Original line number Original line Diff line number Diff line
@@ -468,6 +468,11 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@dentry is the dentry being changed.

 *	@dentry is the dentry being changed.

 *	Return 0 on success.  If error is returned, then the operation

 *	Return 0 on success.  If error is returned, then the operation

 *	causing setuid bit removal is failed.

 *	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 where result will be saved.

 *	In case of failure, @secid will be set to zero.

 *

 *

 * Security hooks for file operations

 * Security hooks for file operations

 *

 *
@@ -636,6 +641,8 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 * @task_getsecid:

 * @task_getsecid:

 *	Retrieve the security identifier of the process @p.

 *	Retrieve the security identifier of the process @p.

 *	@p contains the task_struct for the process and place is into @secid.

 *	@p contains the task_struct for the process and place is into @secid.

 *	In case of failure, @secid will be set to zero.

 *

 * @task_setgroups:

 * @task_setgroups:

 *	Check permission before setting the supplementary group set of the

 *	Check permission before setting the supplementary group set of the

 *	current process.

 *	current process.
@@ -997,6 +1004,11 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@ipcp contains the kernel IPC permission structure

 *	@ipcp contains the kernel IPC permission structure

 *	@flag contains the desired (requested) permission set

 *	@flag contains the desired (requested) permission set

 *	Return 0 if permission is granted.

 *	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.

 *	In case of failure, @secid will be set to zero.

 *

 *

 * Security hooks for individual messages held in System V IPC message queues

 * Security hooks for individual messages held in System V IPC message queues

 * @msg_msg_alloc_security:

 * @msg_msg_alloc_security:
@@ -1317,6 +1329,7 @@ struct security_operations { 
	int (*inode_getsecurity)(const struct inode *inode, const char *name, void **buffer, bool alloc);

	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_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);

  	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_permission) (struct file * file, int mask);

	int (*file_alloc_security) (struct file * file);

	int (*file_alloc_security) (struct file * file);
@@ -1369,6 +1382,7 @@ struct security_operations { 
	void (*task_to_inode)(struct task_struct *p, struct inode *inode);

	void (*task_to_inode)(struct task_struct *p, struct inode *inode);





	int (*ipc_permission) (struct kern_ipc_perm * ipcp, short flag);

	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);

	int (*msg_msg_alloc_security) (struct msg_msg * msg);

	void (*msg_msg_free_security) (struct msg_msg * msg);

	void (*msg_msg_free_security) (struct msg_msg * msg);
@@ -1578,6 +1592,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_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_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);

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_permission(struct file *file, int mask);

int security_file_alloc(struct file *file);

int security_file_alloc(struct file *file);

void security_file_free(struct file *file);

void security_file_free(struct file *file);
@@ -1622,6 +1637,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_reparent_to_init(struct task_struct *p);

void security_task_to_inode(struct task_struct *p, struct inode *inode);

void security_task_to_inode(struct task_struct *p, struct inode *inode);

int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag);

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);

int security_msg_msg_alloc(struct msg_msg *msg);

void security_msg_msg_free(struct msg_msg *msg);

void security_msg_msg_free(struct msg_msg *msg);

int security_msg_queue_alloc(struct msg_queue *msq);

int security_msg_queue_alloc(struct msg_queue *msq);
@@ -2022,6 +2038,11 @@ static inline int security_inode_listsecurity(struct inode *inode, char *buffer, 
	return 0;

	return 0;

}

}





static inline void security_inode_getsecid(const struct inode *inode, u32 *secid)

{

	*secid = 0;

}



static inline int security_file_permission (struct file *file, int mask)

static inline int security_file_permission (struct file *file, int mask)

{

{

	return 0;

	return 0;
@@ -2137,7 +2158,9 @@ static inline int security_task_getsid (struct task_struct *p) 
}

}





static inline void security_task_getsecid (struct task_struct *p, u32 *secid)

static inline void security_task_getsecid (struct task_struct *p, u32 *secid)

{ }

{

	*secid = 0;

}





static inline int security_task_setgroups (struct group_info *group_info)

static inline int security_task_setgroups (struct group_info *group_info)

{

{
@@ -2216,6 +2239,11 @@ static inline int security_ipc_permission (struct kern_ipc_perm *ipcp, 
	return 0;

	return 0;

}

}





static inline void security_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)

{

	*secid = 0;

}



static inline int security_msg_msg_alloc (struct msg_msg * msg)

static inline int security_msg_msg_alloc (struct msg_msg * msg)

{

{

	return 0;

	return 0;

security/dummy.c

+15 −1
Original line number Original line Diff line number Diff line
@@ -424,6 +424,11 @@ static int dummy_inode_listsecurity(struct inode *inode, char *buffer, size_t bu 
	return 0;

	return 0;

}

}





static void dummy_inode_getsecid(const struct inode *inode, u32 *secid)

{

	*secid = 0;

}



static int dummy_file_permission (struct file *file, int mask)

static int dummy_file_permission (struct file *file, int mask)

{

{

	return 0;

	return 0;
@@ -542,7 +547,9 @@ static int dummy_task_getsid (struct task_struct *p) 
}

}





static void dummy_task_getsecid (struct task_struct *p, u32 *secid)

static void dummy_task_getsecid (struct task_struct *p, u32 *secid)

{ }

{

	*secid = 0;

}





static int dummy_task_setgroups (struct group_info *group_info)

static int dummy_task_setgroups (struct group_info *group_info)

{

{
@@ -616,6 +623,11 @@ static int dummy_ipc_permission (struct kern_ipc_perm *ipcp, short flag) 
	return 0;

	return 0;

}

}





static void dummy_ipc_getsecid(struct kern_ipc_perm *ipcp, u32 *secid)

{

	*secid = 0;

}



static int dummy_msg_msg_alloc_security (struct msg_msg *msg)

static int dummy_msg_msg_alloc_security (struct msg_msg *msg)

{

{

	return 0;

	return 0;
@@ -1058,6 +1070,7 @@ void security_fixup_ops (struct security_operations *ops) 
	set_to_dummy_if_null(ops, inode_getsecurity);

	set_to_dummy_if_null(ops, inode_getsecurity);

	set_to_dummy_if_null(ops, inode_setsecurity);

	set_to_dummy_if_null(ops, inode_setsecurity);

	set_to_dummy_if_null(ops, inode_listsecurity);

	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_permission);

	set_to_dummy_if_null(ops, file_alloc_security);

	set_to_dummy_if_null(ops, file_alloc_security);

	set_to_dummy_if_null(ops, file_free_security);

	set_to_dummy_if_null(ops, file_free_security);
@@ -1094,6 +1107,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_reparent_to_init);

 	set_to_dummy_if_null(ops, task_to_inode);

 	set_to_dummy_if_null(ops, task_to_inode);

	set_to_dummy_if_null(ops, ipc_permission);

	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_alloc_security);

	set_to_dummy_if_null(ops, msg_msg_free_security);

	set_to_dummy_if_null(ops, msg_msg_free_security);

	set_to_dummy_if_null(ops, msg_queue_alloc_security);

	set_to_dummy_if_null(ops, msg_queue_alloc_security);

security/security.c

+10 −0
Original line number Original line Diff line number Diff line
@@ -523,6 +523,11 @@ int security_inode_listsecurity(struct inode *inode, char *buffer, size_t buffer 
	return security_ops->inode_listsecurity(inode, buffer, buffer_size);

	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);

}



int security_file_permission(struct file *file, int mask)

int security_file_permission(struct file *file, int mask)

{

{

	return security_ops->file_permission(file, mask);

	return security_ops->file_permission(file, mask);
@@ -712,6 +717,11 @@ int security_ipc_permission(struct kern_ipc_perm *ipcp, short flag) 
	return security_ops->ipc_permission(ipcp, 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);

}



int security_msg_msg_alloc(struct msg_msg *msg)

int security_msg_msg_alloc(struct msg_msg *msg)

{

{

	return security_ops->msg_msg_alloc_security(msg);

	return security_ops->msg_msg_alloc_security(msg);