Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d35b6856 authored by Thomas Graf's avatar Thomas Graf Committed by David S. Miller
Browse files

[NETLINK]: Ignore !NLM_F_REQUEST messages directly in netlink_run_queue() 



netlink_rcv_skb() is changed to skip messages which don't have the
NLM_F_REQUEST bit to avoid every netlink family having to perform this
check on their own.

Signed-off-by: default avatarThomas Graf <tgraf@suug.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 33a0543c

net/core/rtnetlink.c

+0 −4
Original line number Original line Diff line number Diff line
@@ -862,10 +862,6 @@ rtnetlink_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *errp) 
	int type;

	int type;

	int err;

	int err;





	/* Only requests are handled by kernel now */

	if (!(nlh->nlmsg_flags&NLM_F_REQUEST))

		return 0;



	type = nlh->nlmsg_type;

	type = nlh->nlmsg_type;





	/* A control message: ignore them */

	/* A control message: ignore them */

net/netlink/af_netlink.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -1470,10 +1470,15 @@ static int netlink_rcv_skb(struct sk_buff *skb, int (*cb)(struct sk_buff *, 




	while (skb->len >= nlmsg_total_size(0)) {

	while (skb->len >= nlmsg_total_size(0)) {

		nlh = nlmsg_hdr(skb);

		nlh = nlmsg_hdr(skb);

		err = 0;





		if (nlh->nlmsg_len < NLMSG_HDRLEN || skb->len < nlh->nlmsg_len)

		if (nlh->nlmsg_len < NLMSG_HDRLEN || skb->len < nlh->nlmsg_len)

			return 0;

			return 0;





		/* Only requests are handled by the kernel */

		if (!(nlh->nlmsg_flags & NLM_F_REQUEST))

			goto skip;



		if (cb(skb, nlh, &err) < 0) {

		if (cb(skb, nlh, &err) < 0) {

			/* Not an error, but we have to interrupt processing

			/* Not an error, but we have to interrupt processing

			 * here. Note: that in this case we do not pull

			 * here. Note: that in this case we do not pull
@@ -1481,9 +1486,10 @@ static int netlink_rcv_skb(struct sk_buff *skb, int (*cb)(struct sk_buff *, 
			 */

			 */

			if (err == 0)

			if (err == 0)

				return -1;

				return -1;

		}

skip:

		if (nlh->nlmsg_flags & NLM_F_ACK || err)

			netlink_ack(skb, nlh, err);

			netlink_ack(skb, nlh, err);

		} else if (nlh->nlmsg_flags & NLM_F_ACK)

			netlink_ack(skb, nlh, 0);





		netlink_queue_skip(nlh, skb);

		netlink_queue_skip(nlh, skb);

	}

	}

net/netlink/genetlink.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -304,9 +304,6 @@ static int genl_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, 
	struct genlmsghdr *hdr = nlmsg_data(nlh);

	struct genlmsghdr *hdr = nlmsg_data(nlh);

	int hdrlen, err = -EINVAL;

	int hdrlen, err = -EINVAL;





	if (!(nlh->nlmsg_flags & NLM_F_REQUEST))

		goto ignore;



	if (nlh->nlmsg_type < NLMSG_MIN_TYPE)

	if (nlh->nlmsg_type < NLMSG_MIN_TYPE)

		goto ignore;

		goto ignore;

net/xfrm/xfrm_user.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -1858,9 +1858,6 @@ static int xfrm_user_rcv_msg(struct sk_buff *skb, struct nlmsghdr *nlh, int *err 
	struct xfrm_link *link;

	struct xfrm_link *link;

	int type, min_len;

	int type, min_len;





	if (!(nlh->nlmsg_flags & NLM_F_REQUEST))

		return 0;



	type = nlh->nlmsg_type;

	type = nlh->nlmsg_type;





	/* A control message: ignore them */

	/* A control message: ignore them */