ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

zero struct memory in ipc shm (CVE-2010-4072)

Browse Source
This commit is contained in:
Kyle McMartin 2010-11-23 10:55:43 -05:00
parent 79bb6459c7
commit 205e1d9754
2 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ipc-shm-fix-information-leak-to-user.patch Normal file
View File

@ -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;

5
kernel.spec
View File

@ -731,6 +731,7 @@ Patch12307: tty-restore-tty_ldisc_wait_idle.patch
Patch12308: fix-i8k-inline-asm.patch Patch12308: fix-i8k-inline-asm.patch
Patch12400: ipc-zero-struct-memory-for-compat-fns.patch Patch12400: ipc-zero-struct-memory-for-compat-fns.patch
Patch12401: ipc-shm-fix-information-leak-to-user.patch
%endif %endif
@ -1359,6 +1360,9 @@ ApplyPatch fix-i8k-inline-asm.patch
# rhbz#648658 (CVE-2010-4073) # rhbz#648658 (CVE-2010-4073)
ApplyPatch ipc-zero-struct-memory-for-compat-fns.patch ApplyPatch ipc-zero-struct-memory-for-compat-fns.patch
# rhbz#648656 (CVE-2010-4072)
ApplyPatch ipc-shm-fix-information-leak-to-user.patch
# END OF PATCH APPLICATIONS # END OF PATCH APPLICATIONS
%endif %endif
@ -1974,6 +1978,7 @@ fi
%changelog %changelog
* Tue Nov 23 2010 Kyle McMartin <kyle@redhat.com> * Tue Nov 23 2010 Kyle McMartin <kyle@redhat.com>
- zero struct memory in ipc compat (CVE-2010-4073) (#648658) - zero struct memory in ipc compat (CVE-2010-4073) (#648658)
- zero struct memory in ipc shm (CVE-2010-4072) (#648656)
* Tue Nov 23 2010 Kyle McMartin <kyle@redhat.com> * Tue Nov 23 2010 Kyle McMartin <kyle@redhat.com>
- fix-i8k-inline-asm.patch: backport gcc miscompilation fix from git - fix-i8k-inline-asm.patch: backport gcc miscompilation fix from git