Commit 831c9bd3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'selinux-pr-20210923' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux 

Pull SELinux/Smack fixes from Paul Moore:
 "Another single-patch pull request for SELinux, as well as Smack.

  This fixes some credential misuse and is explained reasonably well in
  the patch description"

* tag 'selinux-pr-20210923' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux,smack: fix subjective/objective credential use mixups
parents f10f0481 a3727a8b

security/selinux/hooks.c

+2 −2
Original line number Diff line number Diff line
@@ -2157,7 +2157,7 @@ static int selinux_ptrace_access_check(struct task_struct *child, 
static int selinux_ptrace_traceme(struct task_struct *parent)

{

	return avc_has_perm(&selinux_state,

			    task_sid_subj(parent), task_sid_obj(current),

			    task_sid_obj(parent), task_sid_obj(current),

			    SECCLASS_PROCESS, PROCESS__PTRACE, NULL);

}
@@ -6222,7 +6222,7 @@ static int selinux_msg_queue_msgrcv(struct kern_ipc_perm *msq, struct msg_msg *m 
	struct ipc_security_struct *isec;

	struct msg_security_struct *msec;

	struct common_audit_data ad;

	u32 sid = task_sid_subj(target);

	u32 sid = task_sid_obj(target);

	int rc;



	isec = selinux_ipc(msq);

security/smack/smack_lsm.c

+2 −2
Original line number Diff line number Diff line
@@ -2016,7 +2016,7 @@ static int smk_curacc_on_task(struct task_struct *p, int access, 
				const char *caller)

{

	struct smk_audit_info ad;

	struct smack_known *skp = smk_of_task_struct_subj(p);

	struct smack_known *skp = smk_of_task_struct_obj(p);

	int rc;



	smk_ad_init(&ad, caller, LSM_AUDIT_DATA_TASK);
@@ -3480,7 +3480,7 @@ static void smack_d_instantiate(struct dentry *opt_dentry, struct inode *inode) 
 */

static int smack_getprocattr(struct task_struct *p, char *name, char **value)

{

	struct smack_known *skp = smk_of_task_struct_subj(p);

	struct smack_known *skp = smk_of_task_struct_obj(p);

	char *cp;

	int slen;