netfilter: nf_tables: audit log object reset once per table
Subsystems (4)
Phil Sutter
reviewerPATCH v2 1/1 netfilter: nf_tables: audit log object reset once per table
When resetting multiple objects at once (via dump request), emit a log message per table (or filled skb) and resurrect the 'entries' parameter to contain the number of objects being logged for.
To test the skb exhaustion path, perform some bulk counter and quota adds in the kselftest.
Signed-off-by Phil Sutter <[email protected]>
Reviewed-by Richard Guy Briggs <[email protected]>
---
Changes since v1:
- Rebased onto nf/main, eliminated the dependency on reset locking series
- Dropped a leftover paragraph from the commit message talking about audit_logread adjustment which was avoided by patch reordering before v1 already
--- net/netfilter/nf_tables_api.c | 50 +++++++++++-------- .../testing/selftests/netfilter/nft_audit.sh | 46 +++++++++++++++++ 2 files changed, 74 insertions(+), 22 deletions(-)
net/netfilter/nf_tables_api.c +28 -22
@@ -7615,6 +7615,16 @@ static int nf_tables_fill_obj_info(struct sk_buff *skb, struct net *net,return -1 ; } +static void audit_log_obj_reset (const struct nft_table *table, +unsigned int base_seq,unsigned int nentries) +{ +char *buf =kasprintf (GFP_ATOMIC ,"%s:%u" , table->name, base_seq); + +audit_log_nfcfg (buf, table->family, nentries, +AUDIT_NFT_OP_OBJ_RESET ,GFP_ATOMIC ); +kfree (buf); +} +struct nft_obj_filter {char *table;u32 type;
@@ -7629,8 +7639,10 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)struct net *net =sock_net (skb->sk);int family = nfmsg->nfgen_family;struct nftables_pernet *nft_net; +unsigned int entries =0 ;struct nft_object *obj;bool reset = false; +int rc =0 ;if (NFNL_MSG_TYPE (cb->nlh->nlmsg_type) ==NFT_MSG_GETOBJ_RESET ) reset = true;
@@ -7643,6 +7655,7 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb)if (family !=NFPROTO_UNSPEC && family != table->family)continue ; + entries =0 ;list_for_each_entry_rcu (obj, &table->objects, list) {if (!nft_is_active (net, obj)) goto cont;
@@ -7658,34 +7671,27 @@ static int nf_tables_dump_obj(struct sk_buff *skb, struct netlink_callback *cb) filter->type != NFT_OBJECT_UNSPEC && obj->ops->type->type != filter->type) goto cont; -if (reset) { -char *buf =kasprintf (GFP_ATOMIC , -"%s:%u" , - table->name, - nft_net->base_seq); - -audit_log_nfcfg (buf, - family, - obj->handle, -AUDIT_NFT_OP_OBJ_RESET , -GFP_ATOMIC ); -kfree (buf); - } -if (nf_tables_fill_obj_info (skb, net,NETLINK_CB (cb->skb).portid, - cb->nlh->nlmsg_seq, -NFT_MSG_NEWOBJ , -NLM_F_MULTI |NLM_F_APPEND , - table->family, table, - obj, reset) <0 ) - goto done; + rc =nf_tables_fill_obj_info (skb, net, +NETLINK_CB (cb->skb).portid, + cb->nlh->nlmsg_seq, +NFT_MSG_NEWOBJ , +NLM_F_MULTI |NLM_F_APPEND , + table->family, table, + obj, reset); +if (rc <0 ) +break ; + entries++;nl_dump_check_consistent (cb,nlmsg_hdr (skb)); cont: idx++; } +if (reset && entries) +audit_log_obj_reset (table, nft_net->base_seq, entries); +if (rc <0 ) +break ; } -done:rcu_read_unlock (); cb->args[0 ] = idx;
@@ -7790,7 +7796,7 @@ static int nf_tables_getobj(struct sk_buff *skb, const struct nfnl_info *info,audit_log_nfcfg (buf, family, - obj->handle, +1 ,AUDIT_NFT_OP_OBJ_RESET ,GFP_ATOMIC );kfree (buf);
tools/testing/selftests/netfilter/nft_audit.sh +46 -0
64 lines not on this page · raw message
Signature · 1 line
2.41.0