Nicolas Dichtel
2014-Sep-05 08:57 UTC
[Bridge] [PATCH net-next] netfilter: create audit records for ebtables replaces
This is already done for x_tables (family AF_INET and AF_INET6), let's do it
for AF_BRIDGE also.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com>
---
net/bridge/netfilter/ebtables.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 6d69631b9f4d..4ba0c5c78778 100644
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -26,6 +26,7 @@
#include <asm/uaccess.h>
#include <linux/smp.h>
#include <linux/cpumask.h>
+#include <linux/audit.h>
#include <net/sock.h>
/* needed for logical [in,out]-dev filtering */
#include "../br_private.h"
@@ -1126,6 +1127,20 @@ static int do_replace(struct net *net, const void __user
*user,
}
ret = do_replace_finish(net, &tmp, newinfo);
+#ifdef CONFIG_AUDIT
+ if (audit_enabled) {
+ struct audit_buffer *ab;
+
+ ab = audit_log_start(current->audit_context, GFP_KERNEL,
+ AUDIT_NETFILTER_CFG);
+ if (ab) {
+ audit_log_format(ab, "table=%s family=%u entries=%u",
+ tmp.name, AF_BRIDGE,
+ tmp.nentries);
+ audit_log_end(ab);
+ }
+ }
+#endif
if (ret == 0)
return ret;
free_entries:
--
1.9.0
Pablo Neira Ayuso
2014-Sep-07 16:07 UTC
Re: [PATCH net-next] netfilter: create audit records for ebtables replaces
On Fri, Sep 05, 2014 at 10:50:15AM +0200, Nicolas Dichtel wrote:> This is already done for x_tables (family AF_INET and AF_INET6), let's do it > for AF_BRIDGE also. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com> > --- > net/bridge/netfilter/ebtables.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c > index 6d69631b9f4d..4ba0c5c78778 100644 > --- a/net/bridge/netfilter/ebtables.c > +++ b/net/bridge/netfilter/ebtables.c > @@ -26,6 +26,7 @@ > #include <asm/uaccess.h> > #include <linux/smp.h> > #include <linux/cpumask.h> > +#include <linux/audit.h> > #include <net/sock.h> > /* needed for logical [in,out]-dev filtering */ > #include "../br_private.h" > @@ -1126,6 +1127,20 @@ static int do_replace(struct net *net, const void __user *user, > } > > ret = do_replace_finish(net, &tmp, newinfo); > +#ifdef CONFIG_AUDIT > + if (audit_enabled) { > + struct audit_buffer *ab; > + > + ab = audit_log_start(current->audit_context, GFP_KERNEL, > + AUDIT_NETFILTER_CFG); > + if (ab) { > + audit_log_format(ab, "table=%s family=%u entries=%u", > + tmp.name, AF_BRIDGE, > + tmp.nentries); > + audit_log_end(ab); > + } > + } > +#endifThis chunks belongs to do_replace_finish(). We still need the audit code for compat_do_replace() and iff there are no errors when replacing the table.> if (ret == 0) > return ret; > free_entries: > -- > 1.9.0 >
Pablo Neira Ayuso
2014-Sep-07 16:07 UTC
[Bridge] [PATCH net-next] netfilter: create audit records for ebtables replaces
On Fri, Sep 05, 2014 at 10:50:15AM +0200, Nicolas Dichtel wrote:> This is already done for x_tables (family AF_INET and AF_INET6), let's do it > for AF_BRIDGE also. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com> > --- > net/bridge/netfilter/ebtables.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c > index 6d69631b9f4d..4ba0c5c78778 100644 > --- a/net/bridge/netfilter/ebtables.c > +++ b/net/bridge/netfilter/ebtables.c > @@ -26,6 +26,7 @@ > #include <asm/uaccess.h> > #include <linux/smp.h> > #include <linux/cpumask.h> > +#include <linux/audit.h> > #include <net/sock.h> > /* needed for logical [in,out]-dev filtering */ > #include "../br_private.h" > @@ -1126,6 +1127,20 @@ static int do_replace(struct net *net, const void __user *user, > } > > ret = do_replace_finish(net, &tmp, newinfo); > +#ifdef CONFIG_AUDIT > + if (audit_enabled) { > + struct audit_buffer *ab; > + > + ab = audit_log_start(current->audit_context, GFP_KERNEL, > + AUDIT_NETFILTER_CFG); > + if (ab) { > + audit_log_format(ab, "table=%s family=%u entries=%u", > + tmp.name, AF_BRIDGE, > + tmp.nentries); > + audit_log_end(ab); > + } > + } > +#endifThis chunks belongs to do_replace_finish(). We still need the audit code for compat_do_replace() and iff there are no errors when replacing the table.> if (ret == 0) > return ret; > free_entries: > -- > 1.9.0 >
Richard Guy Briggs
2014-Sep-08 14:02 UTC
Re: [PATCH net-next] netfilter: create audit records for ebtables replaces
On 14/09/05, Nicolas Dichtel wrote:> This is already done for x_tables (family AF_INET and AF_INET6), let's do it > for AF_BRIDGE also. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>ACK.> --- > net/bridge/netfilter/ebtables.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c > index 6d69631b9f4d..4ba0c5c78778 100644 > --- a/net/bridge/netfilter/ebtables.c > +++ b/net/bridge/netfilter/ebtables.c > @@ -26,6 +26,7 @@ > #include <asm/uaccess.h> > #include <linux/smp.h> > #include <linux/cpumask.h> > +#include <linux/audit.h> > #include <net/sock.h> > /* needed for logical [in,out]-dev filtering */ > #include "../br_private.h" > @@ -1126,6 +1127,20 @@ static int do_replace(struct net *net, const void __user *user, > } > > ret = do_replace_finish(net, &tmp, newinfo); > +#ifdef CONFIG_AUDIT > + if (audit_enabled) { > + struct audit_buffer *ab; > + > + ab = audit_log_start(current->audit_context, GFP_KERNEL, > + AUDIT_NETFILTER_CFG); > + if (ab) { > + audit_log_format(ab, "table=%s family=%u entries=%u", > + tmp.name, AF_BRIDGE, > + tmp.nentries); > + audit_log_end(ab); > + } > + } > +#endif > if (ret == 0) > return ret; > free_entries: > -- > 1.9.0 > > -- > Linux-audit mailing list > Linux-audit@redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit- RGB -- Richard Guy Briggs <rbriggs@redhat.com> Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545
Richard Guy Briggs
2014-Sep-08 14:07 UTC
[Bridge] [PATCH net-next] netfilter: create audit records for ebtables replaces
On 14/09/05, Nicolas Dichtel wrote:> This is already done for x_tables (family AF_INET and AF_INET6), let's do it > for AF_BRIDGE also. > > Signed-off-by: Nicolas Dichtel <nicolas.dichtel at 6wind.com>ACK.> --- > net/bridge/netfilter/ebtables.c | 15 +++++++++++++++ > 1 file changed, 15 insertions(+) > > diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c > index 6d69631b9f4d..4ba0c5c78778 100644 > --- a/net/bridge/netfilter/ebtables.c > +++ b/net/bridge/netfilter/ebtables.c > @@ -26,6 +26,7 @@ > #include <asm/uaccess.h> > #include <linux/smp.h> > #include <linux/cpumask.h> > +#include <linux/audit.h> > #include <net/sock.h> > /* needed for logical [in,out]-dev filtering */ > #include "../br_private.h" > @@ -1126,6 +1127,20 @@ static int do_replace(struct net *net, const void __user *user, > } > > ret = do_replace_finish(net, &tmp, newinfo); > +#ifdef CONFIG_AUDIT > + if (audit_enabled) { > + struct audit_buffer *ab; > + > + ab = audit_log_start(current->audit_context, GFP_KERNEL, > + AUDIT_NETFILTER_CFG); > + if (ab) { > + audit_log_format(ab, "table=%s family=%u entries=%u", > + tmp.name, AF_BRIDGE, > + tmp.nentries); > + audit_log_end(ab); > + } > + } > +#endif > if (ret == 0) > return ret; > free_entries: > -- > 1.9.0 > > -- > Linux-audit mailing list > Linux-audit at redhat.com > https://www.redhat.com/mailman/listinfo/linux-audit- RGB -- Richard Guy Briggs <rbriggs at redhat.com> Senior Software Engineer, Kernel Security, AMER ENG Base Operating Systems, Red Hat Remote, Ottawa, Canada Voice: +1.647.777.2635, Internal: (81) 32635, Alt: +1.613.693.0684x3545