Commit fd778461 authored by Eric Paris's avatar Eric Paris
Browse files

security: remove the security_netlink_recv hook as it is equivalent to capable() 



Once upon a time netlink was not sync and we had to get the effective
capabilities from the skb that was being received.  Today we instead get
the capabilities from the current task.  This has rendered the entire
purpose of the hook moot as it is now functionally equivalent to the
capable() call.

Signed-off-by: default avatarEric Paris <eparis@redhat.com>
parent 69f594a3

drivers/scsi/scsi_netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ scsi_nl_rcv_msg(struct sk_buff *skb) 
			goto next_msg;

		}



		if (security_netlink_recv(skb, CAP_SYS_ADMIN)) {

		if (!capable(CAP_SYS_ADMIN)) {

			err = -EPERM;

			goto next_msg;

		}

include/linux/security.h

+0 −14
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ struct xfrm_user_sec_ctx; 
struct seq_file;



extern int cap_netlink_send(struct sock *sk, struct sk_buff *skb);

extern int cap_netlink_recv(struct sk_buff *skb, int cap);



void reset_security_ops(void);
@@ -792,12 +791,6 @@ static inline void security_free_mnt_opts(struct security_mnt_opts *opts) 
 *	@skb contains the sk_buff structure for the netlink message.

 *	Return 0 if the information was successfully saved and message

 *	is allowed to be transmitted.

 * @netlink_recv:

 *	Check permission before processing the received netlink message in

 *	@skb.

 *	@skb contains the sk_buff structure for the netlink message.

 *	@cap indicates the capability required

 *	Return 0 if permission is granted.

 *

 * Security hooks for Unix domain networking.

 *
@@ -1556,7 +1549,6 @@ struct security_operations { 
			  struct sembuf *sops, unsigned nsops, int alter);



	int (*netlink_send) (struct sock *sk, struct sk_buff *skb);

	int (*netlink_recv) (struct sk_buff *skb, int cap);



	void (*d_instantiate) (struct dentry *dentry, struct inode *inode);
@@ -1803,7 +1795,6 @@ void security_d_instantiate(struct dentry *dentry, struct inode *inode); 
int security_getprocattr(struct task_struct *p, char *name, char **value);

int security_setprocattr(struct task_struct *p, char *name, void *value, size_t size);

int security_netlink_send(struct sock *sk, struct sk_buff *skb);

int security_netlink_recv(struct sk_buff *skb, int cap);

int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen);

int security_secctx_to_secid(const char *secdata, u32 seclen, u32 *secid);

void security_release_secctx(char *secdata, u32 seclen);
@@ -2478,11 +2469,6 @@ static inline int security_netlink_send(struct sock *sk, struct sk_buff *skb) 
	return cap_netlink_send(sk, skb);

}



static inline int security_netlink_recv(struct sk_buff *skb, int cap)

{

	return cap_netlink_recv(skb, cap);

}



static inline int security_secid_to_secctx(u32 secid, char **secdata, u32 *seclen)

{

	return -EOPNOTSUPP;

kernel/audit.c

+2 −2
Original line number Diff line number Diff line
@@ -601,13 +601,13 @@ static int audit_netlink_ok(struct sk_buff *skb, u16 msg_type) 
	case AUDIT_TTY_SET:

	case AUDIT_TRIM:

	case AUDIT_MAKE_EQUIV:

		if (security_netlink_recv(skb, CAP_AUDIT_CONTROL))

		if (!capable(CAP_AUDIT_CONTROL))

			err = -EPERM;

		break;

	case AUDIT_USER:

	case AUDIT_FIRST_USER_MSG ... AUDIT_LAST_USER_MSG:

	case AUDIT_FIRST_USER_MSG2 ... AUDIT_LAST_USER_MSG2:

		if (security_netlink_recv(skb, CAP_AUDIT_WRITE))

		if (!capable(CAP_AUDIT_WRITE))

			err = -EPERM;

		break;

	default:  /* bad msg */

net/core/rtnetlink.c

+1 −1
Original line number Diff line number Diff line
@@ -1931,7 +1931,7 @@ static int rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh) 
	sz_idx = type>>2;

	kind = type&3;



	if (kind != 2 && security_netlink_recv(skb, CAP_NET_ADMIN))

	if (kind != 2 && !capable(CAP_NET_ADMIN))

		return -EPERM;



	if (kind == 2 && nlh->nlmsg_flags&NLM_F_DUMP) {

net/decnet/netfilter/dn_rtmsg.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static inline void dnrmg_receive_user_skb(struct sk_buff *skb) 
	if (nlh->nlmsg_len < sizeof(*nlh) || skb->len < nlh->nlmsg_len)

		return;



	if (security_netlink_recv(skb, CAP_NET_ADMIN))

	if (!capable(CAP_NET_ADMIN))

		RCV_SKB_FAIL(-EPERM);



	/* Eventually we might send routing messages too */

CRA Git | Maintained and supported by SUSTech CRA and CCSE