| From 9480016957c216454d5ddc54a88da0124d92b81a Mon Sep 17 00:00:00 2001 |
| From: Mathias Krause <minipli@googlemail.com> |
| Date: Wed, 15 Aug 2012 11:31:56 +0000 |
| Subject: [PATCH] ipvs: fix info leak in getsockopt(IP_VS_SO_GET_TIMEOUT) |
| |
| commit 2d8a041b7bfe1097af21441cb77d6af95f4f4680 upstream. |
| |
| 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 <minipli@googlemail.com> |
| Cc: Wensong Zhang <wensong@linux-vs.org> |
| Cc: Simon Horman <horms@verge.net.au> |
| Cc: Julian Anastasov <ja@ssi.bg> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| --- |
| net/netfilter/ipvs/ip_vs_ctl.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| diff --git a/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c |
| index 36dc1d88c2fa..bd9d805a85a6 100644 |
| --- a/net/netfilter/ipvs/ip_vs_ctl.c |
| +++ b/net/netfilter/ipvs/ip_vs_ctl.c |
| @@ -2469,6 +2469,7 @@ do_ip_vs_get_ctl(struct sock *sk, int cmd, void __user *user, int *len) |
| { |
| struct ip_vs_timeout_user t; |
| |
| + memset(&t, 0, sizeof(t)); |
| __ip_vs_get_timeouts(&t); |
| if (copy_to_user(user, &t, sizeof(t)) != 0) |
| ret = -EFAULT; |
| -- |
| 1.8.5.2 |
| |
