summaryrefslogtreecommitdiffstats
path: root/ipc/shm.c
diff options
context:
space:
mode:
Diffstat (limited to 'ipc/shm.c')
-rw-r--r--ipc/shm.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ipc/shm.c b/ipc/shm.c
index 2b64b0d25bba..dda8f1ff3c35 100644
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -1160,6 +1160,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
1160 down_write(&current->mm->mmap_sem); 1160 down_write(&current->mm->mmap_sem);
1161 if (addr && !(shmflg & SHM_REMAP)) { 1161 if (addr && !(shmflg & SHM_REMAP)) {
1162 err = -EINVAL; 1162 err = -EINVAL;
1163 if (addr + size < addr)
1164 goto invalid;
1165
1163 if (find_vma_intersection(current->mm, addr, addr + size)) 1166 if (find_vma_intersection(current->mm, addr, addr + size))
1164 goto invalid; 1167 goto invalid;
1165 /* 1168 /*