selinux: remove redundant msg_msg_alloc_security (b82f3f68) · Commits · 戴 / test

selinux_msg_msg_alloc_security only calls msg_msg_alloc_security but do nothing else. And also msg_msg_alloc_security is just used by the former. Remove the redundant function to simplify the code. Signed-off-by:

Huaisheng Ye <yehs1@lenovo.com> Acked-by:

Stephen Smalley <sds@tycho.nsa.gov> Signed-off-by:

Paul Moore <paul@paul-moore.com>

security/selinux/hooks.c

+6 −11

Original line number	Diff line number	Diff line
		@@ -5894,16 +5894,6 @@ static void ipc_init_security(struct ipc_security_struct *isec, u16 sclass)
		isec->sid = current_sid();
		}

		static int msg_msg_alloc_security(struct msg_msg *msg)
		{
		struct msg_security_struct *msec;

		msec = selinux_msg_msg(msg);
		msec->sid = SECINITSID_UNLABELED;

		return 0;
		}

		static int ipc_has_perm(struct kern_ipc_perm *ipc_perms,
		u32 perms)
		{
		@@ -5922,7 +5912,12 @@ static int ipc_has_perm(struct kern_ipc_perm *ipc_perms,

		static int selinux_msg_msg_alloc_security(struct msg_msg *msg)
		{
		return msg_msg_alloc_security(msg);
		struct msg_security_struct *msec;

		msec = selinux_msg_msg(msg);
		msec->sid = SECINITSID_UNLABELED;

		return 0;
		}

		/* message queue security operations */

Admin message