netlink: Add answer_flags to netlink_callback

dsahern · davem330 · commit 22e6c58b8c28 · 2018-10-16T00:13:12.000-07:00
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 &lt;dsahern@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/include/linux/netlink.h b/include/linux/netlink.h
@@ -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];
 };
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c
@@ -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;
 

Original file line number	Diff line number	Diff line change
`@@ -2257,7 +2257,8 @@ static int netlink_dump(struct sock *sk)`
`2257`	`2257`	`}`
`2258`	`2258`
`2259`	`2259`	`nlh = nlmsg_put_answer(skb, cb, NLMSG_DONE,`
`2260`		`- sizeof(nlk->dump_done_errno), NLM_F_MULTI);`
	`2260`	`+ sizeof(nlk->dump_done_errno),`
	`2261`	`+ NLM_F_MULTI \| cb->answer_flags);`
`2261`	`2262`	`if (WARN_ON(!nlh))`
`2262`	`2263`	`goto errout_skb;`
`2263`	`2264`