summaryrefslogtreecommitdiffstats
path: root/ipc-shm-fix-information-leak-to-user.patch
diff options
context:
space:
mode:
Diffstat (limited to 'ipc-shm-fix-information-leak-to-user.patch')
-rw-r--r--ipc-shm-fix-information-leak-to-user.patch30
1 files changed, 30 insertions, 0 deletions
diff --git a/ipc-shm-fix-information-leak-to-user.patch b/ipc-shm-fix-information-leak-to-user.patch
new file mode 100644
index 0000000..b23ad43
--- /dev/null
+++ b/ipc-shm-fix-information-leak-to-user.patch
@@ -0,0 +1,30 @@
+From: Vasiliy Kulikov <segooon@gmail.com>
+Date: Sat, 30 Oct 2010 14:22:49 +0000 (+0400)
+Subject: ipc: shm: fix information leak to userland
+X-Git-Tag: v2.6.37-rc1~24
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=3af54c9bd9e6f14f896aac1bb0e8405ae0bc7a44
+
+ipc: shm: fix information leak to userland
+
+The shmid_ds structure is copied to userland with shm_unused{,2,3}
+fields unitialized. It leads to leaking of contents of kernel stack
+memory.
+
+Signed-off-by: Vasiliy Kulikov <segooon@gmail.com>
+Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
+Cc: stable@kernel.org
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+---
+
+diff --git a/ipc/shm.c b/ipc/shm.c
+index fd658a1..7d3bb22 100644
+--- a/ipc/shm.c
++++ b/ipc/shm.c
+@@ -479,6 +479,7 @@ static inline unsigned long copy_shmid_to_user(void __user *buf, struct shmid64_
+ {
+ struct shmid_ds out;
+
++ memset(&out, 0, sizeof(out));
+ ipc64_perm_to_ipc_perm(&in->shm_perm, &out.shm_perm);
+ out.shm_segsz = in->shm_segsz;
+ out.shm_atime = in->shm_atime;