* [PATCH -next] netfilter: nf_conntrack_standalone: fix error return code
@ 2013-03-27 13:57 Wei Yongjun
2013-04-01 11:20 ` Pablo Neira Ayuso
0 siblings, 1 reply; 2+ messages in thread
From: Wei Yongjun @ 2013-03-27 13:57 UTC (permalink / raw)
To: pablo, kaber; +Cc: yongjun_wei, netfilter-devel, netfilter, coreteam
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Fix to return a negative error code from the error handling
case instead of 0, as returned elsewhere in function
nf_conntrack_standalone_init().
Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
---
net/netfilter/nf_conntrack_standalone.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/net/netfilter/nf_conntrack_standalone.c b/net/netfilter/nf_conntrack_standalone.c
index 6c69fbd..ebb67d3 100644
--- a/net/netfilter/nf_conntrack_standalone.c
+++ b/net/netfilter/nf_conntrack_standalone.c
@@ -572,6 +572,7 @@ static int __init nf_conntrack_standalone_init(void)
register_net_sysctl(&init_net, "net", nf_ct_netfilter_table);
if (!nf_ct_netfilter_header) {
pr_err("nf_conntrack: can't register to sysctl.\n");
+ ret = -ENOMEM;
goto out_sysctl;
}
#endif
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH -next] netfilter: nf_conntrack_standalone: fix error return code
2013-03-27 13:57 [PATCH -next] netfilter: nf_conntrack_standalone: fix error return code Wei Yongjun
@ 2013-04-01 11:20 ` Pablo Neira Ayuso
0 siblings, 0 replies; 2+ messages in thread
From: Pablo Neira Ayuso @ 2013-04-01 11:20 UTC (permalink / raw)
To: Wei Yongjun; +Cc: kaber, yongjun_wei, netfilter-devel, netfilter, coreteam
On Wed, Mar 27, 2013 at 09:57:10PM +0800, Wei Yongjun wrote:
> From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
>
> Fix to return a negative error code from the error handling
> case instead of 0, as returned elsewhere in function
> nf_conntrack_standalone_init().
Applied to the nf tree, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-04-01 11:20 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-27 13:57 [PATCH -next] netfilter: nf_conntrack_standalone: fix error return code Wei Yongjun
2013-04-01 11:20 ` Pablo Neira Ayuso
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).