Update from 2.6.36 to 2.6.36.4wip-dissipation-jerickso

1 files changed, 1 insertions, 0 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 52ed77eb9713..b42738067146 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;