[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <20101007021836.GA14666@outflux.net>
Date: Wed, 6 Oct 2010 19:18:36 -0700
From: Kees Cook <kees.cook@...onical.com>
To: linux-kernel@...r.kernel.org
Cc: Al Viro <viro@...iv.linux.org.uk>,
Andrew Morton <akpm@...ux-foundation.org>,
Jiri Slaby <jslaby@...e.cz>,
"David S. Miller" <davem@...emloft.net>, stable@...nel.org
Subject: [PATCH v2] ipc: initialize structure memory to zero for shmctl
The old shm interface will leak a few bytes of stack contents. Explicitly
initialize the structure to zero-fill the untouched fields, using memset
instead of C99-style in case there are ever holes in the structure.
Signed-off-by: Kees Cook <kees.cook@...onical.com>
---
ipc/shm.c | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ipc/shm.c b/ipc/shm.c
index 52ed77e..f943b1e 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;
@@ -524,6 +525,7 @@ static inline unsigned long copy_shminfo_to_user(void __user *buf, struct shminf
{
struct shminfo out;
+ memset(&out, 0, sizeof(out));
if(in->shmmax > INT_MAX)
out.shmmax = INT_MAX;
else
--
1.7.1
--
Kees Cook
Ubuntu Security Team
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists