From e01efd8ca017dab0787cfb1aa42c61700467d0b2 Mon Sep 17 00:00:00 2001
From: Vasiliy Kulikov <segooon@gmail.com>
Date: Sat, 30 Oct 2010 18:22:49 +0400
Subject: [PATCH] --- yaml --- r: 221019 b: refs/heads/master c:
 3af54c9bd9e6f14f896aac1bb0e8405ae0bc7a44 h: refs/heads/master i:   221017:
 8d25cbdaa486444d76521f91d30c43df2df3fdc3   221015:
 6cc73bcb2c6618f77b5463b11f7273ecd6ace54c v: v3

---
 [refs]          | 2 +-
 trunk/ipc/shm.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a71b8916182f..edd9616fe148 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 504b701bb1655747575095543c083267418e02ac
+refs/heads/master: 3af54c9bd9e6f14f896aac1bb0e8405ae0bc7a44
diff --git a/trunk/ipc/shm.c b/trunk/ipc/shm.c
index fd658a1c2b88..7d3bb22a9302 100644
--- a/trunk/ipc/shm.c
+++ b/trunk/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;