summaryrefslogtreecommitdiff
path: root/ipc
diff options
context:
space:
mode:
authorVasiliy Kulikov <segooon@gmail.com>2010-10-30 18:22:49 +0400
committerGreg Kroah-Hartman <gregkh@suse.de>2010-12-09 13:32:37 -0800
commitf3aa864b00bbcd49327d7911f8c39a65e51e2ca9 (patch)
tree576de861f74a3699a71369dd1170c5782a5eeaf5 /ipc
parentc849311ca209e47937484ffe115b66193fb9c23b (diff)
downloadlinux-3.10-f3aa864b00bbcd49327d7911f8c39a65e51e2ca9.tar.gz
linux-3.10-f3aa864b00bbcd49327d7911f8c39a65e51e2ca9.tar.bz2
linux-3.10-f3aa864b00bbcd49327d7911f8c39a65e51e2ca9.zip
ipc: shm: fix information leak to userland
commit 3af54c9bd9e6f14f896aac1bb0e8405ae0bc7a44 upstream. 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> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'ipc')
-rw-r--r--ipc/shm.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 52ed77eb971..b4273806714 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -473,6 +473,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;