Merge tag 'audit-pr-20180605' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoor...

[linux-2.6-microblaze.git] / net / bridge / netfilter / ebtables.c

diff --git a/net/bridge/netfilter/ebtables.c b/net/bridge/netfilter/ebtables.c
index 28a4c34..0e27c51 100644 (file)
--- a/net/bridge/netfilter/ebtables.c
+++ b/net/bridge/netfilter/ebtables.c
@@ -1062,7 +1062,7 @@ static int do_replace_finish(struct net *net, struct ebt_replace *repl,
 
 #ifdef CONFIG_AUDIT
        if (audit_enabled) {
-               audit_log(current->audit_context, GFP_KERNEL,
+               audit_log(audit_context(), GFP_KERNEL,
                          AUDIT_NETFILTER_CFG,
                          "table=%s family=%u entries=%u",
                          repl->name, AF_BRIDGE, repl->nentries);
@@ -1954,7 +1954,8 @@ static int compat_mtw_from_user(struct compat_ebt_entry_mwt *mwt,
        int off, pad = 0;
        unsigned int size_kern, match_size = mwt->match_size;
 
-       strlcpy(name, mwt->u.name, sizeof(name));
+       if (strscpy(name, mwt->u.name, sizeof(name)) < 0)
+               return -EINVAL;
 
        if (state->buf_kern_start)
                dst = state->buf_kern_start + state->buf_kern_offset;