Commit b8f3ab42 authored Jan 18, 2011 by David S. Miller

Revert "netlink: test for all flags of the NLM_F_DUMP composite"



This reverts commit 0ab03c2b.

It breaks several things including the avahi daemon.

Signed-off-by: David S. Miller <davem@davemloft.net>

parent ff76015f

net/core/rtnetlink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1820,7 +1820,7 @@ static int rtnetlink_rcv_msg(struct sk_buff skb, struct nlmsghdr nlh)
		if (kind != 2 && security_netlink_recv(skb, CAP_NET_ADMIN))
		return -EPERM;

		if (kind == 2 && (nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) {
		if (kind == 2 && nlh->nlmsg_flags&NLM_F_DUMP) {
		struct sock *rtnl;
		rtnl_dumpit_func dumpit;

net/ipv4/inet_diag.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -858,7 +858,7 @@ static int inet_diag_rcv_msg(struct sk_buff skb, struct nlmsghdr nlh)
		nlmsg_len(nlh) < hdrlen)
		return -EINVAL;

		if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) {
		if (nlh->nlmsg_flags & NLM_F_DUMP) {
		if (nlmsg_attrlen(nlh, hdrlen)) {
		struct nlattr *attr;

net/netfilter/nf_conntrack_netlink.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -924,7 +924,7 @@ ctnetlink_get_conntrack(struct sock ctnl, struct sk_buff skb,
		u16 zone;
		int err;

		if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP)
		if (nlh->nlmsg_flags & NLM_F_DUMP)
		return netlink_dump_start(ctnl, skb, nlh, ctnetlink_dump_table,
		ctnetlink_done);

		@@ -1787,7 +1787,7 @@ ctnetlink_get_expect(struct sock ctnl, struct sk_buff skb,
		u16 zone;
		int err;

		if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) {
		if (nlh->nlmsg_flags & NLM_F_DUMP) {
		return netlink_dump_start(ctnl, skb, nlh,
		ctnetlink_exp_dump_table,
		ctnetlink_exp_done);

net/netlink/genetlink.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -519,7 +519,7 @@ static int genl_rcv_msg(struct sk_buff skb, struct nlmsghdr nlh)
		security_netlink_recv(skb, CAP_NET_ADMIN))
		return -EPERM;

		if ((nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) {
		if (nlh->nlmsg_flags & NLM_F_DUMP) {
		if (ops->dumpit == NULL)
		return -EOPNOTSUPP;

net/xfrm/xfrm_user.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -2189,7 +2189,7 @@ static int xfrm_user_rcv_msg(struct sk_buff skb, struct nlmsghdr nlh)

		if ((type == (XFRM_MSG_GETSA - XFRM_MSG_BASE) \|\|
		type == (XFRM_MSG_GETPOLICY - XFRM_MSG_BASE)) &&
		(nlh->nlmsg_flags & NLM_F_DUMP) == NLM_F_DUMP) {
		(nlh->nlmsg_flags & NLM_F_DUMP)) {
		if (link->dump == NULL)
		return -EINVAL;