summaryrefslogtreecommitdiffstats
path: root/net/core
diff options
context:
space:
mode:
authorEugene Teo <eugeneteo@kernel.sg>2009-02-23 15:38:41 -0800
committerDavid S. Miller <davem@davemloft.net>2009-02-23 15:38:41 -0800
commit50fee1dec5d71b8a14c1b82f2f42e16adc227f8b (patch)
tree8eab115c8416a266e054c403163dc6aac0400943 /net/core
parentebe47d47b7b7fed72dabcce4717da727b4e2367d (diff)
downloadblackbird-op-linux-50fee1dec5d71b8a14c1b82f2f42e16adc227f8b.tar.gz
blackbird-op-linux-50fee1dec5d71b8a14c1b82f2f42e16adc227f8b.zip
net: amend the fix for SO_BSDCOMPAT gsopt infoleak
The fix for CVE-2009-0676 (upstream commit df0bca04) is incomplete. Note that the same problem of leaking kernel memory will reappear if someone on some architecture uses struct timeval with some internal padding (for example tv_sec 64-bit and tv_usec 32-bit) --- then, you are going to leak the padded bytes to userspace. Signed-off-by: Eugene Teo <eugeneteo@kernel.sg> Reported-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core')
-rw-r--r--net/core/sock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/core/sock.c b/net/core/sock.c
index 6e4f14d1ef81..5f97caa158e8 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -696,7 +696,7 @@ int sock_getsockopt(struct socket *sock, int level, int optname,
if (len < 0)
return -EINVAL;
- v.val = 0;
+ memset(&v, 0, sizeof(v));
switch(optname) {
case SO_DEBUG:
OpenPOWER on IntegriCloud