Commit 22e6c58b authored Oct 15, 2018 by David Ahern Committed by David S. Miller Oct 16, 2018

netlink: Add answer_flags to netlink_callback



With dump filtering we need a way to ensure the NLM_F_DUMP_FILTERED
flag is set on a message back to the user if the data returned is
influenced by some input attributes. Normally this can be done as
messages are added to the skb, but if the filter results in no data
being returned, the user could be confused as to why.

This patch adds answer_flags to the netlink_callback allowing dump
handlers to set the NLM_F_DUMP_FILTERED at a minimum in the
NLMSG_DONE message ensuring the flag gets back to the user.

The netlink_callback space is initialized to 0 via a memset in
__netlink_dump_start, so init of the new answer_flags is covered.

Signed-off-by: David Ahern <dsahern@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent e8567951

include/linux/netlink.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -180,6 +180,7 @@ struct netlink_callback {
		u16 family;
		u16 min_dump_alloc;
		bool strict_check;
		u16 answer_flags;
		unsigned int prev_seq, seq;
		long args[6];
		};

net/netlink/af_netlink.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -2257,7 +2257,8 @@ static int netlink_dump(struct sock *sk)
		}

		nlh = nlmsg_put_answer(skb, cb, NLMSG_DONE,
		sizeof(nlk->dump_done_errno), NLM_F_MULTI);
		sizeof(nlk->dump_done_errno),
		NLM_F_MULTI \| cb->answer_flags);
		if (WARN_ON(!nlh))
		goto errout_skb;

Admin message