linux/net/netfilter/ipvs, branch v3.2.38

ipvs: fix info leak in getsockopt(IP_VS_SO_GET_TIMEOUT)

2012-09-19T14:04:54Z

[ Upstream commit 2d8a041b7bfe1097af21441cb77d6af95f4f4680 ] If at least one of CONFIG_IP_VS_PROTO_TCP or CONFIG_IP_VS_PROTO_UDP is not set, __ip_vs_get_timeouts() does not fully initialize the structure that gets copied to userland and that for leaks up to 12 bytes of kernel stack. Add an explicit memset(0) before passing the structure to __ip_vs_get_timeouts() to avoid the info leak. Signed-off-by: Mathias Krause Cc: Wensong Zhang Cc: Simon Horman Cc: Julian Anastasov Signed-off-by: David S. Miller Signed-off-by: Ben Hutchings

ipvs: fix matching of fwmark templates during scheduling

2012-03-01T00:31:19Z

commit e0aac52e17a3db68fe2ceae281780a70fc69957f upstream. Commit f11017ec2d1859c661f4e2b12c4a8d250e1f47cf (2.6.37) moved the fwmark variable in subcontext that is invalidated before reaching the ip_vs_ct_in_get call. As vaddr is provided as pointer in the param structure make sure the fwmark variable is in same context. As the fwmark templates can not be matched, more and more template connections are created and the controlled connections can not go to single real server. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso Signed-off-by: Greg Kroah-Hartman

ipvs: try also real server with port 0 in backup server

2011-12-31T15:06:29Z

We should not forget to try for real server with port 0 in the backup server when processing the sync message. We should do it in all cases because the backup server can use different forwarding method. Signed-off-by: Julian Anastasov Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso

ipvs: Remove unused variable "cs" from ip_vs_leave function.

2011-11-01T08:19:57Z

This is to address the following warning during compilation time: net/netfilter/ipvs/ip_vs_core.c: In function ‘ip_vs_leave’: net/netfilter/ipvs/ip_vs_core.c:532: warning: unused variable ‘cs’ This variable is indeed no longer in use. Signed-off-by: Krzysztof Wilczynski Signed-off-by: Simon Horman

netfilter: Remove unnecessary OOM logging messages

2011-11-01T08:19:49Z

Site specific OOM messages are duplications of a generic MM out of memory message and aren't really useful, so just delete them. Signed-off-by: Joe Perches Signed-off-by: Patrick McHardy Signed-off-by: Pablo Neira Ayuso

ipvs: Removed unused variables

2011-11-01T08:19:37Z

ipvs is not used in ip_vs_genl_set_cmd() or ip_vs_genl_get_cmd() Acked-by: Julian Anastasov Acked-by Hans Schillstrom Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso

ipvs: Remove unused return value of protocol state transitions

2011-11-01T08:19:33Z

Acked-by: Julian Anastasov Acked-by Hans Schillstrom Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso

ipvs: Remove unused parameter from ip_vs_confirm_conntrack()

2011-11-01T08:19:29Z

Acked-by: Julian Anastasov Acked-by Hans Schillstrom Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso

ipvs: Expose ip_vs_ftp module parameters via sysfs.

2011-11-01T08:19:21Z

This is to expose "ports" parameter via sysfs so it can be read at any time in order to determine what port or ports were passed to the module at the point when it was loaded. Signed-off-by: Krzysztof Wilczynski Signed-off-by: Simon Horman Signed-off-by: Pablo Neira Ayuso

Merge branch 'nf' of git://1984.lsi.us.es/net

2011-10-17T23:38:03Z