On Mon, May 15, 2017 at 06:44:32PM +0200, Phil Sutter wrote:
> On Mon, May 15, 2017 at 05:53:31PM +0200, Pablo Neira Ayuso wrote:
> > On Mon, May 15, 2017 at 04:51:49PM +0200, Phil Sutter wrote:
> > > When committing a transaction, report PID and name of user space process
> > > which initiated it.
> > >
> > > Signed-off-by: Phil Sutter <[email protected]>
> > > ---
> > > include/uapi/linux/netfilter/nf_tables.h | 16 +++++++++++
> > > net/netfilter/nf_tables_api.c | 49
> > > ++++++++++++++++++++++++++++++++
> > > 2 files changed, 65 insertions(+)
> > >
> > > diff --git a/include/uapi/linux/netfilter/nf_tables.h
> > > b/include/uapi/linux/netfilter/nf_tables.h
> > > index 683f6f88fcace..7c012690a5f02 100644
> > > --- a/include/uapi/linux/netfilter/nf_tables.h
> > > +++ b/include/uapi/linux/netfilter/nf_tables.h
> > > @@ -90,6 +90,7 @@ enum nft_verdicts {
> > > * @NFT_MSG_GETOBJ: get a stateful object (enum nft_obj_attributes)
> > > * @NFT_MSG_DELOBJ: delete a stateful object (enum nft_obj_attributes)
> > > * @NFT_MSG_GETOBJ_RESET: get and reset a stateful object (enum
> > > nft_obj_attributes)
> > > + * @NFT_MSG_PROC_INFO: get info about user space process which initiated
> > > the transaction
> > > */
> > > enum nf_tables_msg_types {
> > > NFT_MSG_NEWTABLE,
> > > @@ -114,6 +115,7 @@ enum nf_tables_msg_types {
> > > NFT_MSG_GETOBJ,
> > > NFT_MSG_DELOBJ,
> > > NFT_MSG_GETOBJ_RESET,
> > > + NFT_MSG_PROC_INFO,
> >
> > No need for a new message. You can place this into existing the NEWGEN
> > messages.
>
> But that message is sent last and so at the time nft sees it, the events
> will have been printed already, no?
This is an event, so it is asynchronous. From a timely perspective, we
get nothing if we send it just a bit before.
I suspect the problem is the lack of context, ie. access ctx->portid,
ctx->seq and ctx->report, then we should take this from the original
initial netlink message header coming in the batch (see
nfnetlink_rcv_batch() in nfnetlink.c).
Look, we send a batch from userspace that look like this:
netlink header [ type = NFNL_MSG_BATCH_BEGIN ]
nfnetlink header
payload
netlink header [ type = nfnl_msg_type(NFNL_SUBSYS_NFTABLES,
NFT_MSG_NEWRULE) ]
nfnetlink header
payload
...
netlink header [ type = NFNL_MSG_BATCH_END ]
nfnetlink header
There's an initial NFNL_MSG_BATCH_BEGIN and a trailing
NFNL_MSG_BATCH_END. No trailing NFNL_MSG_BATCH_END means abort
transaction, it provides a way to test if a ruleset applies cleanly,
similar to the -C command in iptables (this doesn't exist in nft
userspace though yet, it would be good to add this).
I think you should extract this relevant information you need from the
initial NFNL_MSG_BATCH_BEGIN netlink header, so semantically, this
applies to the result of the batch, ie. you use it from the NEWGEN
message.
We should pass some structure to nf_tables_commit() that provides this
global information, probably in an initial patch in the series.
--
To unsubscribe from this list: send the line "unsubscribe netfilter-devel" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
