Merge tag 'pci-v3.16-changes-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / ipc / shm.c

diff --git a/ipc/shm.c b/ipc/shm.c
index 9e51bf24634463d5ec0e493a6888173d57ac7b0a..89fc354156cb918342751f72e1017727877d86e0 100644 (file)
--- a/ipc/shm.c
+++ b/ipc/shm.c
@@ -493,6 +493,9 @@ static int newseg(struct ipc_namespace *ns, struct ipc_params *params)
        if (size < SHMMIN || size > ns->shm_ctlmax)
                return -EINVAL;
 
+       if (numpages << PAGE_SHIFT < size)
+               return -ENOSPC;
+
        if (ns->shm_tot + numpages < ns->shm_tot ||
                        ns->shm_tot + numpages > ns->shm_ctlall)
                return -ENOSPC;