diff options
| author | Dan Rosenberg <drosenberg@vsecurity.com> | 2010-10-27 15:34:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-27 18:03:13 -0700 |
| commit | 03145beb455cf5c20a761e8451e30b8a74ba58d9 (patch) | |
| tree | a27b2221818b89039fc948d19780d52bb5c70789 /ipc/compat_mq.c | |
| parent | b795218075a1e1183169abb66a90dcdcf30367f9 (diff) | |
| download | linux-3.10-03145beb455cf5c20a761e8451e30b8a74ba58d9.tar.gz linux-3.10-03145beb455cf5c20a761e8451e30b8a74ba58d9.tar.bz2 linux-3.10-03145beb455cf5c20a761e8451e30b8a74ba58d9.zip | |
ipc: initialize structure memory to zero for compat functions
This takes care of leaking uninitialized kernel stack memory to
userspace from non-zeroed fields in structs in compat ipc functions.
Signed-off-by: Dan Rosenberg <drosenberg@vsecurity.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'ipc/compat_mq.c')
| -rw-r--r-- | ipc/compat_mq.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c index d8d1e9ff4e8..380ea4fe08e 100644 --- a/ipc/compat_mq.c +++ b/ipc/compat_mq.c @@ -53,6 +53,9 @@ asmlinkage long compat_sys_mq_open(const char __user *u_name, void __user *p = NULL; if (u_attr && oflag & O_CREAT) { struct mq_attr attr; + + memset(&attr, 0, sizeof(attr)); + p = compat_alloc_user_space(sizeof(attr)); if (get_compat_mq_attr(&attr, u_attr) || copy_to_user(p, &attr, sizeof(attr))) @@ -127,6 +130,8 @@ asmlinkage long compat_sys_mq_getsetattr(mqd_t mqdes, struct mq_attr __user *p = compat_alloc_user_space(2 * sizeof(*p)); long ret; + memset(&mqstat, 0, sizeof(mqstat)); + if (u_mqstat) { if (get_compat_mq_attr(&mqstat, u_mqstat) || copy_to_user(p, &mqstat, sizeof(mqstat))) |