diff options
author | David S. Miller <davem@davemloft.net> | 2013-04-04 21:41:53 (GMT) |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-04-04 21:41:53 (GMT) |
commit | 4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f (patch) | |
tree | 99a4808dce728bc3b7bfe6ca6a5eae4bd6eeac99 /net/netfilter/nfnetlink_queue_core.c | |
parent | 518314ffe4ab5d7ffae0607d0c56ba57e0279732 (diff) | |
parent | 906b1c394d0906a154fbdc904ca506bceb515756 (diff) | |
download | linux-fsl-qoriq-4f4ecd5f2a94135a8a556232aa9ddc55944d9c8f.tar.xz |
Merge branch 'master' of git://1984.lsi.us.es/nf
Pablo Neira Ayuso says:
====================
The following patchset contains netfilter updates for your net tree,
they are:
* Fix missing the skb->trace reset in nf_reset, noticed by Gao Feng
while using the TRACE target with several net namespaces.
* Fix prefix translation in IPv6 NPT if non-multiple of 32 prefixes
are used, from Matthias Schiffer.
* Fix invalid nfacct objects with empty name, they are now rejected
with -EINVAL, spotted by Michael Zintakis, patch from myself.
* A couple of fixes for wrong return values in the error path of
nfnetlink_queue and nf_conntrack, from Wei Yongjun.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netfilter/nfnetlink_queue_core.c')
-rw-r--r-- | net/netfilter/nfnetlink_queue_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/netfilter/nfnetlink_queue_core.c b/net/netfilter/nfnetlink_queue_core.c index 1cb4854..42680b2 100644 --- a/net/netfilter/nfnetlink_queue_core.c +++ b/net/netfilter/nfnetlink_queue_core.c @@ -1062,8 +1062,10 @@ static int __init nfnetlink_queue_init(void) #ifdef CONFIG_PROC_FS if (!proc_create("nfnetlink_queue", 0440, - proc_net_netfilter, &nfqnl_file_ops)) + proc_net_netfilter, &nfqnl_file_ops)) { + status = -ENOMEM; goto cleanup_subsys; + } #endif register_netdevice_notifier(&nfqnl_dev_notifier); |