[PATCH RFC 24/48] Audit: xt_AUDIT: Log audit message in proper user namespace

From: Gao feng
Date: Mon May 06 2013 - 22:29:40 EST


we can log audit message in the user namespace which
netfilter xt_AUDIT rules belongs to.

Signed-off-by: Gao feng <gaofeng@xxxxxxxxxxxxxx>
---
net/netfilter/xt_AUDIT.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/net/netfilter/xt_AUDIT.c b/net/netfilter/xt_AUDIT.c
index 3228d7f..b1ffba2 100644
--- a/net/netfilter/xt_AUDIT.c
+++ b/net/netfilter/xt_AUDIT.c
@@ -122,12 +122,14 @@ static unsigned int
audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
{
const struct xt_audit_info *info = par->targinfo;
+ struct net *net = dev_net(par->in ? par->in : par->out);
+ struct user_namespace *ns = net->user_ns;
struct audit_buffer *ab;

- if (audit_enabled == 0)
+ if (audit_enabled_ns(ns) == 0)
goto errout;

- ab = audit_log_start(NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);
+ ab = audit_log_start_ns(ns, NULL, GFP_ATOMIC, AUDIT_NETFILTER_PKT);
if (ab == NULL)
goto errout;

@@ -172,7 +174,7 @@ audit_tg(struct sk_buff *skb, const struct xt_action_param *par)
audit_log_secctx(ab, skb->secmark);
#endif

- audit_log_end(ab);
+ audit_log_end_ns(ns, ab);

errout:
return XT_CONTINUE;
--
1.8.1.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/