Update 2.6.36 to 2.6.36.4wip-dissipation2-jerickso

1 files changed, 5 insertions, 0 deletions

diff --git a/ipc/compat_mq.c b/ipc/compat_mq.c
index d8d1e9ff4e88..380ea4fe08e7 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)))