Merge branch 'master'

2 files changed, 3 insertions, 2 deletions

diff --git a/ipc/shm.c b/ipc/shm.c
index 6b0c9af5bbf7..1c2faf62bc73 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -162,6 +162,8 @@ static int shm_mmap(struct file * file, struct vm_area_struct * vma)
         ret = shmem_mmap(file, vma);
         if (ret == 0) {
                 vma->vm_ops = &shm_vm_ops;
+                if (!(vma->vm_flags & VM_WRITE))
+                        vma->vm_flags &= ~VM_MAYWRITE;
                 shm_inc(file->f_dentry->d_inode->i_ino);
         }
 
diff --git a/ipc/util.c b/ipc/util.c
index 5e785a29e1e6..b3dcfad3b4f7 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -183,8 +183,7 @@ static int grow_ary(struct ipc_ids* ids, int newsize)
         if(new == NULL)
                 return size;
         new->size = newsize;
-        memcpy(new->p, ids->entries->p, sizeof(struct kern_ipc_perm *)*size +
-                                        sizeof(struct ipc_id_ary));
+        memcpy(new->p, ids->entries->p, sizeof(struct kern_ipc_perm *)*size);
         for(i=size;i<newsize;i++) {
                 new->p[i] = NULL;
         }