From: Patrick McHardy <kaber@xxxxxxxxx>
All requests contain a portid, but only dumps use multipart messages.
Have the caller pass the requested flags to nf_tables_fill_*_info()
instead of trying to deduce them based on the portid presence.
Signed-off-by: Patrick McHardy <kaber@xxxxxxxxx>
---
net/netfilter/nf_tables_api.c | 28 +++++++++++++---------------
1 Datei geändert, 13 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
diff --git a/net/netfilter/nf_tables_api.c b/net/netfilter/nf_tables_api.c
index c4e4baa..27f7155 100644
--- a/net/netfilter/nf_tables_api.c
+++ b/net/netfilter/nf_tables_api.c
@@ -162,17 +162,16 @@ static const struct nla_policy nft_table_policy[NFTA_TABLE_MAX + 1] = {
};
static int nf_tables_fill_table_info(struct sk_buff *skb, u32 portid, u32 seq,
- int event, int family,
+ int event, u32 flags, int family,
const struct nft_table *table)
{
struct nlmsghdr *nlh;
struct nfgenmsg *nfmsg;
event |= NFNL_SUBSYS_NFTABLES << 8;
- nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct nfgenmsg), 0);
+ nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct nfgenmsg), flags);
if (nlh == NULL)
goto nla_put_failure;
- nlh->nlmsg_flags = portid ? NLM_F_MULTI : 0;
nfmsg = nlmsg_data(nlh);
nfmsg->nfgen_family = family;
@@ -211,7 +210,8 @@ static int nf_tables_table_notify(const struct sk_buff *oskb,
if (skb == NULL)
goto err;
- err = nf_tables_fill_table_info(skb, portid, seq, event, family, table);
+ err = nf_tables_fill_table_info(skb, portid, seq, event, 0, family,
+ table);
if (err < 0) {
kfree_skb(skb);
goto err;
@@ -247,7 +247,7 @@ static int nf_tables_dump_tables(struct sk_buff *skb,
if (nf_tables_fill_table_info(skb,
NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
- NFT_MSG_NEWTABLE,
+ NFT_MSG_NEWTABLE, NLM_F_MULTI,
afi->family, table) < 0)
goto done;
cont:
@@ -290,7 +290,7 @@ static int nf_tables_gettable(struct sock *nlsk, struct sk_buff *skb,
return -ENOMEM;
err = nf_tables_fill_table_info(skb2, NETLINK_CB(skb).portid,
- nlh->nlmsg_seq, NFT_MSG_NEWTABLE,
+ nlh->nlmsg_seq, NFT_MSG_NEWTABLE, 0,
family, table);
if (err < 0)
goto err;
@@ -524,7 +524,7 @@ static const struct nla_policy nft_hook_policy[NFTA_HOOK_MAX + 1] = {
};
static int nf_tables_fill_chain_info(struct sk_buff *skb, u32 portid, u32 seq,
- int event, int family,
+ int event, u32 flags, int family,
const struct nft_table *table,
const struct nft_chain *chain)
{
@@ -532,10 +532,9 @@ static int nf_tables_fill_chain_info(struct sk_buff *skb, u32 portid, u32 seq,
struct nfgenmsg *nfmsg;
event |= NFNL_SUBSYS_NFTABLES << 8;
- nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct nfgenmsg), 0);
+ nlh = nlmsg_put(skb, portid, seq, event, sizeof(struct nfgenmsg), flags);
if (nlh == NULL)
goto nla_put_failure;
- nlh->nlmsg_flags = portid ? NLM_F_MULTI : 0;
nfmsg = nlmsg_data(nlh);
nfmsg->nfgen_family = family;
@@ -604,8 +603,8 @@ static int nf_tables_chain_notify(const struct sk_buff *oskb,
if (skb == NULL)
goto err;
- err = nf_tables_fill_chain_info(skb, portid, seq, event, family, table,
- chain);
+ err = nf_tables_fill_chain_info(skb, portid, seq, event, 0, family,
+ table, chain);
if (err < 0) {
kfree_skb(skb);
goto err;
@@ -642,7 +641,7 @@ static int nf_tables_dump_chains(struct sk_buff *skb,
sizeof(cb->args) - sizeof(cb->args[0]));
if (nf_tables_fill_chain_info(skb, NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
- NFT_MSG_NEWCHAIN,
+ NFT_MSG_NEWCHAIN, NLM_F_MULTI,
afi->family, table, chain) < 0)
goto done;
cont:
@@ -692,7 +691,7 @@ static int nf_tables_getchain(struct sock *nlsk, struct sk_buff *skb,
return -ENOMEM;
err = nf_tables_fill_chain_info(skb2, NETLINK_CB(skb).portid,
- nlh->nlmsg_seq, NFT_MSG_NEWCHAIN,
+ nlh->nlmsg_seq, NFT_MSG_NEWCHAIN, 0,
family, table, chain);
if (err < 0)
goto err;
@@ -1141,7 +1140,6 @@ static int nf_tables_fill_rule_info(struct sk_buff *skb, u32 portid, u32 seq,
flags);
if (nlh == NULL)
goto nla_put_failure;
- nlh->nlmsg_flags = portid ? NLM_F_MULTI : 0;
nfmsg = nlmsg_data(nlh);
nfmsg->nfgen_family = family;
@@ -1238,7 +1236,7 @@ static int nf_tables_dump_rules(struct sk_buff *skb,
sizeof(cb->args) - sizeof(cb->args[0]));
if (nf_tables_fill_rule_info(skb, NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq,
- NFT_MSG_NEWRULE, 0,
+ NFT_MSG_NEWRULE, NLM_F_MULTI,
afi->family, table, chain, rule) < 0)
goto done;
cont:
--
1.7.11.7
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
