selinux: remove redundant selinux_nlmsg_perm
Subsystems (2)
PATCH v2 1/1 selinux: remove redundant selinux_nlmsg_perm
From: Huaisheng Ye <[email protected]>
selinux_nlmsg_perm is used for only by selinux_netlink_send. Remove the redundant function to simplify the code.
Fix a typo by suggestion from Stephen.
Signed-off-by Huaisheng Ye <[email protected]>
Acked-by Stephen Smalley <[email protected]>
--- security/selinux/hooks.c | 73 ++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 39 deletions(-)
security/selinux/hooks.c +34 -39
@@ -5507,44 +5507,6 @@ static int selinux_tun_dev_open(void *security)return 0 ; } -static int selinux_nlmsg_perm (struct sock *sk,struct sk_buff *skb) -{ -int err =0 ; -u32 perm; -struct nlmsghdr *nlh; -struct sk_security_struct *sksec = sk->sk_security; - -if (skb->len <NLMSG_HDRLEN ) { - err = -EINVAL ; - goto out; - } - nlh =nlmsg_hdr (skb); - - err =selinux_nlmsg_lookup (sksec->sclass, nlh->nlmsg_type, &perm); -if (err) { -if (err == -EINVAL ) { -pr_warn_ratelimited ("SELinux: unrecognized netlink" -" message: protocol=%hu nlmsg_type=%hu sclass=%s" -" pig=%d comm=%s\n" , - sk->sk_protocol, nlh->nlmsg_type, - secclass_map[sksec->sclass -1 ].name, -task_pid_nr (current), current->comm); -if (!enforcing_enabled (&selinux_state) || -security_get_allow_unknown (&selinux_state)) - err =0 ; - } - -/* Ignore */ -if (err == -ENOENT ) - err =0 ; - goto out; - } - - err =sock_has_perm (sk, perm); -out: -return err; -} -#ifdef CONFIG_NETFILTER static unsigned int selinux_ip_forward(struct sk_buff *skb,
@@ -5873,7 +5835,40 @@ static unsigned int selinux_ipv6_postroute(void *priv,static int selinux_netlink_send (struct sock *sk,struct sk_buff *skb) { -return selinux_nlmsg_perm (sk, skb); +int err =0 ; +u32 perm; +struct nlmsghdr *nlh; +struct sk_security_struct *sksec = sk->sk_security; + +if (skb->len <NLMSG_HDRLEN ) { + err = -EINVAL ; + goto out; + } + nlh =nlmsg_hdr (skb); + + err =selinux_nlmsg_lookup (sksec->sclass, nlh->nlmsg_type, &perm); +if (err) { +if (err == -EINVAL ) { +pr_warn_ratelimited ("SELinux: unrecognized netlink" +" message: protocol=%hu nlmsg_type=%hu sclass=%s" +" pid=%d comm=%s\n" , + sk->sk_protocol, nlh->nlmsg_type, + secclass_map[sksec->sclass -1 ].name, +task_pid_nr (current), current->comm); +if (!enforcing_enabled (&selinux_state) || +security_get_allow_unknown (&selinux_state)) + err =0 ; + } + +/* Ignore */ +if (err == -ENOENT ) + err =0 ; + goto out; + } + + err =sock_has_perm (sk, perm); +out: +return err; }static void ipc_init_security (struct ipc_security_struct *isec,u16 sclass)
Signature · 1 line
1.8.3.1
Quoted 5 lines · Huaisheng Ye
From: Huaisheng Ye <[email protected]>
selinux_nlmsg_permis used for only byselinux_netlink_send. Remove the redundant function to simplify the code.
Quoted 7 lines
Fix a typo by suggestion from Stephen.
Signed-off-by Huaisheng Ye <[email protected]>Acked-by Stephen Smalley <[email protected]>--- security/selinux/hooks.c | 73 ++++++++++++++++++++++-------------------------- 1 file changed, 34 insertions(+), 39 deletions(-)
Merged into selinux/next, thanks!
Signature · 2 lines
paul moore www.paul-moore.com