Commit 09b71ada authored by Xu Panda's avatar Xu Panda Committed by Paul Moore
Browse files

selinux: remove the unneeded result variable 



Return the value avc_has_perm() directly instead of storing it in
another redundant variable.

Reported-by: default avatarZeal Robot <zealci@zte.com.cn>
Signed-off-by: default avatarXu Panda <xu.panda@zte.com.cn>
[PM: subject line tweak]
Signed-off-by: default avatarPaul Moore <paul@paul-moore.com>
parent 6354324d

security/selinux/hooks.c

+9 −15
Original line number Diff line number Diff line
@@ -5986,7 +5986,6 @@ static int selinux_msg_queue_alloc_security(struct kern_ipc_perm *msq) 
	struct ipc_security_struct *isec;

	struct common_audit_data ad;

	u32 sid = current_sid();

	int rc;



	isec = selinux_ipc(msq);

	ipc_init_security(isec, SECCLASS_MSGQ);
@@ -5994,10 +5993,9 @@ static int selinux_msg_queue_alloc_security(struct kern_ipc_perm *msq) 
	ad.type = LSM_AUDIT_DATA_IPC;

	ad.u.ipc_id = msq->key;



	rc = avc_has_perm(&selinux_state,

	return avc_has_perm(&selinux_state,

			    sid, isec->sid, SECCLASS_MSGQ,

			    MSGQ__CREATE, &ad);

	return rc;

}



static int selinux_msg_queue_associate(struct kern_ipc_perm *msq, int msqflg)
@@ -6125,7 +6123,6 @@ static int selinux_shm_alloc_security(struct kern_ipc_perm *shp) 
	struct ipc_security_struct *isec;

	struct common_audit_data ad;

	u32 sid = current_sid();

	int rc;



	isec = selinux_ipc(shp);

	ipc_init_security(isec, SECCLASS_SHM);
@@ -6133,10 +6130,9 @@ static int selinux_shm_alloc_security(struct kern_ipc_perm *shp) 
	ad.type = LSM_AUDIT_DATA_IPC;

	ad.u.ipc_id = shp->key;



	rc = avc_has_perm(&selinux_state,

	return avc_has_perm(&selinux_state,

			    sid, isec->sid, SECCLASS_SHM,

			    SHM__CREATE, &ad);

	return rc;

}



static int selinux_shm_associate(struct kern_ipc_perm *shp, int shmflg)
@@ -6210,7 +6206,6 @@ static int selinux_sem_alloc_security(struct kern_ipc_perm *sma) 
	struct ipc_security_struct *isec;

	struct common_audit_data ad;

	u32 sid = current_sid();

	int rc;



	isec = selinux_ipc(sma);

	ipc_init_security(isec, SECCLASS_SEM);
@@ -6218,10 +6213,9 @@ static int selinux_sem_alloc_security(struct kern_ipc_perm *sma) 
	ad.type = LSM_AUDIT_DATA_IPC;

	ad.u.ipc_id = sma->key;



	rc = avc_has_perm(&selinux_state,

	return avc_has_perm(&selinux_state,

			    sid, isec->sid, SECCLASS_SEM,

			    SEM__CREATE, &ad);

	return rc;

}



static int selinux_sem_associate(struct kern_ipc_perm *sma, int semflg)