2019-06-18 14:24:00

by Colin King

Subject: [PATCH][V2][next] netfilter: synproxy: ensure zero is returned on non-error return path

From: Colin Ian King <[email protected]>

Currently functions nf_synproxy_{ipc4|ipv6}_init return an uninitialized
garbage value in variable ret on a successful return. Fix this by
returning zero on success.

Addresses-Coverity: ("Uninitialized scalar variable")
Fixes: d7f9b2f18eae ("netfilter: synproxy: extract SYNPROXY infrastructure from {ipt, ip6t}_SYNPROXY")
Signed-off-by: Colin Ian King <[email protected]>
---
net/netfilter/nf_synproxy_core.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net/netfilter/nf_synproxy_core.c b/net/netfilter/nf_synproxy_core.c
index 50677285f82e..7bf5202e3222 100644
--- a/net/netfilter/nf_synproxy_core.c
+++ b/net/netfilter/nf_synproxy_core.c
@@ -798,7 +798,7 @@ int nf_synproxy_ipv4_init(struct synproxy_net *snet, struct net *net)
}

snet->hook_ref4++;
- return err;
+ return 0;
}
EXPORT_SYMBOL_GPL(nf_synproxy_ipv4_init);

@@ -1223,7 +1223,7 @@ nf_synproxy_ipv6_init(struct synproxy_net *snet, struct net *net)
}

snet->hook_ref6++;
- return err;
+ return 0;
}
EXPORT_SYMBOL_GPL(nf_synproxy_ipv6_init);

--
2.20.1

2019-06-19 10:51:52

by Pablo Neira Ayuso

Subject: Re: [PATCH][V2][next] netfilter: synproxy: ensure zero is returned on non-error return path

On Tue, Jun 18, 2019 at 03:22:44PM +0100, Colin King wrote:
> From: Colin Ian King <[email protected]>
>
> Currently functions nf_synproxy_{ipc4|ipv6}_init return an uninitialized
> garbage value in variable ret on a successful return. Fix this by
> returning zero on success.

Applied, thanks Colin.