Commit 69311e7c authored by Pablo Neira Ayuso's avatar Pablo Neira Ayuso
Browse files

netfilter: nfnetlink_hook: Use same family as request message 



Use the same family as the request message, for consistency. The
netlink payload provides sufficient information to describe the hook
object, including the family.

This makes it easier to userspace to correlate the hooks are that
visited by the packets for a certain family.

Fixes: e2cf17d3 ("netfilter: add new hook nfnl subsystem")
Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
parent 3d9bbaf6

net/netfilter/nfnetlink_hook.c

+3 −3
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static int nfnl_hook_put_nft_chain_info(struct sk_buff *nlskb, 
static int nfnl_hook_dump_one(struct sk_buff *nlskb,

			      const struct nfnl_dump_hook_data *ctx,

			      const struct nf_hook_ops *ops,

			      unsigned int seq)

			      int family, unsigned int seq)

{

	u16 event = nfnl_msg_type(NFNL_SUBSYS_HOOK, NFNL_MSG_HOOK_GET);

	unsigned int portid = NETLINK_CB(nlskb).portid;
@@ -124,7 +124,7 @@ static int nfnl_hook_dump_one(struct sk_buff *nlskb, 
	char *module_name;

#endif

	nlh = nfnl_msg_put(nlskb, portid, seq, event,

			   NLM_F_MULTI, ops->pf, NFNETLINK_V0, 0);

			   NLM_F_MULTI, family, NFNETLINK_V0, 0);

	if (!nlh)

		goto nla_put_failure;
@@ -264,7 +264,7 @@ static int nfnl_hook_dump(struct sk_buff *nlskb, 
	ops = nf_hook_entries_get_hook_ops(e);



	for (; i < e->num_hook_entries; i++) {

		err = nfnl_hook_dump_one(nlskb, ctx, ops[i],

		err = nfnl_hook_dump_one(nlskb, ctx, ops[i], family,

					 cb->nlh->nlmsg_seq);

		if (err)

			break;