netfilter: nf_tables: Audit log setelem reset
Subsystems (3)
Phil Sutter
reviewerPATCH 1/2 netfilter: nf_tables: Audit log setelem reset
Since set element reset is not integrated into nf_tables' transaction logic, an explicit log call is needed, similar to NFT_MSG_GETOBJ_RESET handling.
For the sake of simplicity, catchall element reset will always generate a dedicated log entry. This relieves nf_tables_dump_set() from having to adjust the logged element count depending on whether a catchall element was found or not.
--- include/linux/audit.h | 1 + kernel/auditsc.c | 1 + net/netfilter/nf_tables_api.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-)
include/linux/audit.h +1 -0
@@ -117,6 +117,7 @@ enum audit_nfcfgop {AUDIT_NFT_OP_OBJ_RESET ,AUDIT_NFT_OP_FLOWTABLE_REGISTER ,AUDIT_NFT_OP_FLOWTABLE_UNREGISTER , +AUDIT_NFT_OP_SETELEM_RESET , AUDIT_NFT_OP_INVALID, };
kernel/auditsc.c +1 -0
@@ -143,6 +143,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { { AUDIT_NFT_OP_OBJ_RESET, "nft_reset_obj" }, { AUDIT_NFT_OP_FLOWTABLE_REGISTER, "nft_register_flowtable" }, { AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, "nft_unregister_flowtable" }, + { AUDIT_NFT_OP_SETELEM_RESET, "nft_reset_setelem" }, { AUDIT_NFT_OP_INVALID, "nft_invalid" }, };
net/netfilter/nf_tables_api.c +28 -3
@@ -102,6 +102,7 @@ static const u8 nft2audit_op[NFT_MSG_MAX] = { // enum nf_tables_msg_types [NFT_MSG_NEWFLOWTABLE] = AUDIT_NFT_OP_FLOWTABLE_REGISTER, [NFT_MSG_GETFLOWTABLE] = AUDIT_NFT_OP_INVALID, [NFT_MSG_DELFLOWTABLE] = AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, + [NFT_MSG_GETSETELEM_RESET] = AUDIT_NFT_OP_SETELEM_RESET, };static void nft_validate_state_update (struct nft_table *table,u8 new_validate_state)
@@ -5661,13 +5662,25 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,return nf_tables_fill_setelem (args->skb, set, elem, args->reset); } +static void audit_log_nft_set_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_SETELEM_RESET ,GFP_ATOMIC ); +kfree (buf); +} +struct nft_set_dump_ctx {const struct nft_set *set;struct nft_ctx ctx; };static int nft_set_catchall_dump (struct net *net,struct sk_buff *skb, -const struct nft_set *set,bool reset) +const struct nft_set *set,bool reset, +unsigned int base_seq) {struct nft_set_elem_catchall *catchall;u8 genmask =nft_genmask_cur (net);
@@ -5683,6 +5696,8 @@ static int nft_set_catchall_dump(struct net *net, struct sk_buff *skb, elem.priv = catchall->elem; ret =nf_tables_fill_setelem (skb, set, &elem, reset); +if (reset && !ret) +audit_log_nft_set_reset (set->table, base_seq,1 );break ; }
@@ -5762,12 +5777,17 @@ static int nf_tables_dump_set(struct sk_buff *skb, struct netlink_callback *cb) set->ops->walk (&dump_ctx->ctx, set, &args.iter);if (!args.iter.err && args.iter.count == cb->args[0 ]) - args.iter.err =nft_set_catchall_dump (net, skb, set, reset); + args.iter.err =nft_set_catchall_dump (net, skb, set, + reset, cb->seq);rcu_read_unlock ();nla_nest_end (skb, nest);nlmsg_end (skb, nlh); +if (reset && args.iter.count > args.iter.skip) +audit_log_nft_set_reset (table, cb->seq, + args.iter.count - args.iter.skip); +if (args.iter.err && args.iter.err != -EMSGSIZE )return args.iter.err;if (args.iter.count == cb->args[0 ])
@@ -5992,13 +6012,13 @@ static int nf_tables_getsetelem(struct sk_buff *skb,struct netlink_ext_ack *extack = info->extack;u8 genmask =nft_genmask_cur (info->net);u8 family = info->nfmsg->nfgen_family; +int rem, err =0 , nelems =0 ;struct net *net = info->net;struct nft_table *table;struct nft_set *set;struct nlattr *attr;struct nft_ctx ctx;bool reset = false; -int rem, err =0 ; table =nft_table_lookup (net, nla[NFTA_SET_ELEM_LIST_TABLE ], family, genmask,0 );
@@ -6041,8 +6061,13 @@ static int nf_tables_getsetelem(struct sk_buff *skb,NL_SET_BAD_ATTR (extack, attr);break ; } + nelems++; } +if (reset) +audit_log_nft_set_reset (table,nft_pernet (net)->base_seq, + nelems); +return err; }
Signature · 1 line
2.41.0
Phil Sutter
reviewerPATCH 2/2 netfilter: nf_tables: Audit log rule reset
Resetting rules' stateful data happens outside of the transaction logic, so 'get' and 'dump' handlers have to emit audit log entries themselves.
--- include/linux/audit.h | 1 + kernel/auditsc.c | 1 + net/netfilter/nf_tables_api.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+)
include/linux/audit.h +1 -0
@@ -118,6 +118,7 @@ enum audit_nfcfgop {AUDIT_NFT_OP_FLOWTABLE_REGISTER ,AUDIT_NFT_OP_FLOWTABLE_UNREGISTER ,AUDIT_NFT_OP_SETELEM_RESET , +AUDIT_NFT_OP_RULE_RESET , AUDIT_NFT_OP_INVALID, };
kernel/auditsc.c +1 -0
@@ -144,6 +144,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { { AUDIT_NFT_OP_FLOWTABLE_REGISTER, "nft_register_flowtable" }, { AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, "nft_unregister_flowtable" }, { AUDIT_NFT_OP_SETELEM_RESET, "nft_reset_setelem" }, + { AUDIT_NFT_OP_RULE_RESET, "nft_reset_rule" }, { AUDIT_NFT_OP_INVALID, "nft_invalid" }, };
net/netfilter/nf_tables_api.c +18 -0
@@ -3432,6 +3432,18 @@ static void nf_tables_rule_notify(const struct nft_ctx *ctx,nfnetlink_set_err (ctx->net, ctx->portid,NFNLGRP_NFTABLES , -ENOBUFS ); } +static void audit_log_rule_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_RULE_RESET ,GFP_ATOMIC ); +kfree (buf); +} +struct nft_rule_dump_ctx {char *table;char *chain;
@@ -3538,6 +3550,9 @@ static int nf_tables_dump_rules(struct sk_buff *skb, done:rcu_read_unlock (); +if (reset && idx > cb->args[0 ]) +audit_log_rule_reset (table, cb->seq, idx - cb->args[0 ]); + cb->args[0 ] = idx;return skb->len; }
@@ -3645,6 +3660,9 @@ static int nf_tables_getrule(struct sk_buff *skb, const struct nfnl_info *info,if (err <0 ) goto err_fill_rule_info; +if (reset) +audit_log_rule_reset (table,nft_pernet (net)->base_seq,1 ); +return nfnetlink_unicast (skb2, net,NETLINK_CB (skb).portid); err_fill_rule_info:
Signature · 1 line
2.41.0
Pablo Neira Ayuso
maintainerRe: [nf PATCH 2/2] netfilter: nf_tables: Audit log rule reset
Quoted 41 lines · Phil Sutter
Resetting rules' stateful data happens outside of the transaction logic, so 'get' and 'dump' handlers have to emit audit log entries themselves.
Cc Richard Guy Briggs <[email protected]>Fixes 8daa8fde3fc3f ("netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET")Signed-off-by Phil Sutter <[email protected]>--- include/linux/audit.h | 1 + kernel/auditsc.c | 1 + net/netfilter/nf_tables_api.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+)include/linux/audit.h +1
-0@@ -118,6 +118,7 @@ enum audit_nfcfgop {AUDIT_NFT_OP_FLOWTABLE_REGISTER ,AUDIT_NFT_OP_FLOWTABLE_UNREGISTER ,AUDIT_NFT_OP_SETELEM_RESET , +AUDIT_NFT_OP_RULE_RESET , AUDIT_NFT_OP_INVALID, };kernel/auditsc.c +1
-0@@ -144,6 +144,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { { AUDIT_NFT_OP_FLOWTABLE_REGISTER, "nft_register_flowtable" }, { AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, "nft_unregister_flowtable" }, { AUDIT_NFT_OP_SETELEM_RESET, "nft_reset_setelem" }, + { AUDIT_NFT_OP_RULE_RESET, "nft_reset_rule" }, { AUDIT_NFT_OP_INVALID, "nft_invalid" }, };net/netfilter/nf_tables_api.c +0
-0
net/netfilter/nf_tables_api.c static void nf_tables_rule_notify(const struct nft_ctx *ctx, · line 3440
Quoted 9 lines
net/netfilter/nf_tables_api.c +6
-0@@ -3432,6 +3432,18 @@ static void nf_tables_rule_notify(const struct nft_ctx *ctx,nfnetlink_set_err (ctx->net, ctx->portid,NFNLGRP_NFTABLES , -ENOBUFS ); } +static void audit_log_rule_reset (const struct nft_table *table, +unsigned int base_seq, +unsigned int nentries) +{ +char *buf =kasprintf (GFP_ATOMIC ,"%s:%u" , + table->name, base_seq);
No check for NULL.
Pablo Neira Ayuso
maintainerRe: [nf PATCH 2/2] netfilter: nf_tables: Audit log rule reset
In reply to Phil SutterQuoted 2 lines · Phil Sutter
Resetting rules' stateful data happens outside of the transaction logic, so 'get' and 'dump' handlers have to emit audit log entries themselves.
Also applied to nf, thanks
--
Linux-audit mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/linux-audit
Re: [nf PATCH 2/2] netfilter: nf_tables: Audit log rule reset
In reply to Phil SutterQuoted 4 lines · Phil Sutter
Resetting rules' stateful data happens outside of the transaction logic, so 'get' and 'dump' handlers have to emit audit log entries themselves.
Quoted 8 lines
Cc Richard Guy Briggs <[email protected]>Fixes 8daa8fde3fc3f ("netfilter: nf_tables: Introduce NFT_MSG_GETRULE_RESET")Signed-off-by Phil Sutter <[email protected]>--- include/linux/audit.h | 1 + kernel/auditsc.c | 1 + net/netfilter/nf_tables_api.c | 18 ++++++++++++++++++ 3 files changed, 20 insertions(+)
See my comments in patch 1/2.
Signature · 1 line
paul-moore.com
Pablo Neira Ayuso
maintainerQuoted 55 lines · Phil Sutter
Since set element reset is not integrated into
nf_tables' transaction logic, an explicit log call is needed, similar toNFT_MSG_GETOBJ_RESEThandling.For the sake of simplicity, catchall element reset will always generate a dedicated log entry. This relieves
nf_tables_dump_set()from having to adjust the logged element count depending on whether a catchall element was found or not.Cc Richard Guy Briggs <[email protected]>Fixes 079cd633219d7 ("netfilter: nf_tables: Introduce NFT_MSG_GETSETELEM_RESET")Signed-off-by Phil Sutter <[email protected]>--- include/linux/audit.h | 1 + kernel/auditsc.c | 1 + net/netfilter/nf_tables_api.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-)include/linux/audit.h +1
-0@@ -117,6 +117,7 @@ enum audit_nfcfgop {AUDIT_NFT_OP_OBJ_RESET ,AUDIT_NFT_OP_FLOWTABLE_REGISTER ,AUDIT_NFT_OP_FLOWTABLE_UNREGISTER , +AUDIT_NFT_OP_SETELEM_RESET , AUDIT_NFT_OP_INVALID, };kernel/auditsc.c +1
-0@@ -143,6 +143,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { { AUDIT_NFT_OP_OBJ_RESET, "nft_reset_obj" }, { AUDIT_NFT_OP_FLOWTABLE_REGISTER, "nft_register_flowtable" }, { AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, "nft_unregister_flowtable" }, + { AUDIT_NFT_OP_SETELEM_RESET, "nft_reset_setelem" }, { AUDIT_NFT_OP_INVALID, "nft_invalid" }, };net/netfilter/nf_tables_api.c +1
-0@@ -102,6 +102,7 @@ static const u8 nft2audit_op[NFT_MSG_MAX] = { // enum nf_tables_msg_types [NFT_MSG_NEWFLOWTABLE] = AUDIT_NFT_OP_FLOWTABLE_REGISTER, [NFT_MSG_GETFLOWTABLE] = AUDIT_NFT_OP_INVALID, [NFT_MSG_DELFLOWTABLE] = AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, + [NFT_MSG_GETSETELEM_RESET] = AUDIT_NFT_OP_SETELEM_RESET, };static void nft_validate_state_update (struct nft_table *table,u8 new_validate_state)
net/netfilter/nf_tables_api.c static int nf_tables_dump_setelem(const struct nft_ctx *ctx, · line 5669
Quoted 8 lines
net/netfilter/nf_tables_api.c +5
-0@@ -5661,13 +5662,25 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,return nf_tables_fill_setelem (args->skb, set, elem, args->reset); } +static void audit_log_nft_set_reset (const struct nft_table *table, +unsigned int base_seq, +unsigned int nentries) +{ +char *buf =kasprintf (GFP_ATOMIC ,"%s:%u" , table->name, base_seq);
No check for NULL?
I can see we have more like this in the tree.
Phil Sutter
reviewerQuoted 67 lines · Pablo Neira Ayuso
Quoted 55 lines · Phil Sutter
Since set element reset is not integrated into
nf_tables' transaction logic, an explicit log call is needed, similar toNFT_MSG_GETOBJ_RESEThandling.For the sake of simplicity, catchall element reset will always generate a dedicated log entry. This relieves
nf_tables_dump_set()from having to adjust the logged element count depending on whether a catchall element was found or not.Cc Richard Guy Briggs <[email protected]>Fixes 079cd633219d7 ("netfilter: nf_tables: Introduce NFT_MSG_GETSETELEM_RESET")Signed-off-by Phil Sutter <[email protected]>--- include/linux/audit.h | 1 + kernel/auditsc.c | 1 + net/netfilter/nf_tables_api.c | 31 ++++++++++++++++++++++++++++--- 3 files changed, 30 insertions(+), 3 deletions(-)include/linux/audit.h +1
-0@@ -117,6 +117,7 @@ enum audit_nfcfgop {AUDIT_NFT_OP_OBJ_RESET ,AUDIT_NFT_OP_FLOWTABLE_REGISTER ,AUDIT_NFT_OP_FLOWTABLE_UNREGISTER , +AUDIT_NFT_OP_SETELEM_RESET , AUDIT_NFT_OP_INVALID, };kernel/auditsc.c +1
-0@@ -143,6 +143,7 @@ static const struct audit_nfcfgop_tab audit_nfcfgs[] = { { AUDIT_NFT_OP_OBJ_RESET, "nft_reset_obj" }, { AUDIT_NFT_OP_FLOWTABLE_REGISTER, "nft_register_flowtable" }, { AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, "nft_unregister_flowtable" }, + { AUDIT_NFT_OP_SETELEM_RESET, "nft_reset_setelem" }, { AUDIT_NFT_OP_INVALID, "nft_invalid" }, };net/netfilter/nf_tables_api.c +1
-0@@ -102,6 +102,7 @@ static const u8 nft2audit_op[NFT_MSG_MAX] = { // enum nf_tables_msg_types [NFT_MSG_NEWFLOWTABLE] = AUDIT_NFT_OP_FLOWTABLE_REGISTER, [NFT_MSG_GETFLOWTABLE] = AUDIT_NFT_OP_INVALID, [NFT_MSG_DELFLOWTABLE] = AUDIT_NFT_OP_FLOWTABLE_UNREGISTER, + [NFT_MSG_GETSETELEM_RESET] = AUDIT_NFT_OP_SETELEM_RESET, };static void nft_validate_state_update (struct nft_table *table,u8 new_validate_state)net/netfilter/nf_tables_api.c static int nf_tables_dump_setelem(const struct nft_ctx *ctx, · line 5669
Quoted 8 lines
net/netfilter/nf_tables_api.c +5
-0@@ -5661,13 +5662,25 @@ static int nf_tables_dump_setelem(const struct nft_ctx *ctx,return nf_tables_fill_setelem (args->skb, set, elem, args->reset); } +static void audit_log_nft_set_reset (const struct nft_table *table, +unsigned int base_seq, +unsigned int nentries) +{ +char *buf =kasprintf (GFP_ATOMIC ,"%s:%u" , table->name, base_seq);No check for NULL?
Quoted 1 line
I can see we have more like this in the tree.
Well, I merely copy-pasted that bit. (No excuse, I know.) The pointer is passed on to audit_log_format() as a string argument and will end at vsnprintf(), which detects and sanitizes NULL string args.
Cheers, Phil
Quoted 8 lines · Phil Sutter
Since set element reset is not integrated into
nf_tables' transaction logic, an explicit log call is needed, similar toNFT_MSG_GETOBJ_RESEThandling.For the sake of simplicity, catchall element reset will always generate a dedicated log entry. This relieves
nf_tables_dump_set()from having to adjust the logged element count depending on whether a catchall element was found or not.
Applied, thanks Phil
--
Linux-audit mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/linux-audit
Richard Guy Briggs
Reviewed-byQuoted 11 lines · Pablo Neira Ayuso
Quoted 8 lines · Phil Sutter
Since set element reset is not integrated into
nf_tables' transaction logic, an explicit log call is needed, similar toNFT_MSG_GETOBJ_RESEThandling.For the sake of simplicity, catchall element reset will always generate a dedicated log entry. This relieves
nf_tables_dump_set()from having to adjust the logged element count depending on whether a catchall element was found or not.Applied, thanks Phil
Thanks Phil, Pablo. If it isn't too late, please add my
- RGB
--
Richard Guy Briggs <[email protected]>
Sr. S/W Engineer, Kernel Security, Base Operating Systems Remote, Ottawa, Red Hat Canada
Upstream IRC: SunRaycer
Voice: +1.613.860 2354 SMS: +1.613.518.6570
--
Linux-audit mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/linux-audit
Quoted 11 lines · Richard Guy Briggs
Quoted 10 lines · Pablo Neira Ayuso
Quoted 8 lines · Phil Sutter
Since set element reset is not integrated into
nf_tables' transaction logic, an explicit log call is needed, similar toNFT_MSG_GETOBJ_RESEThandling.For the sake of simplicity, catchall element reset will always generate a dedicated log entry. This relieves
nf_tables_dump_set()from having to adjust the logged element count depending on whether a catchall element was found or not.
Quoted 4 lines
Quoted 1 line
Applied, thanks Phil
Thanks Phil, Pablo. If it isn't too late, please add my
Reviewed-by Richard Guy Briggs <[email protected]>
Similarly, you can add my ACK. FWIW, if you're sending patches out during the first few days of the merge window it might be advisable to wait more than a day or two to give the relevant maintainers a chance to review the patch.
Also, as a note for future submissions, we've moved the audit kernel mailing list to [email protected].
Signature · 1 line
paul-moore.com