diff options
| author | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:10 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2017-03-20 12:03:10 +0800 |
| commit | e0d60977f25c7a33b2acda240a1d121bf0a35deb (patch) | |
| tree | 4f930533fa1e36e0ec75ee8bcaa82d2320985a2c /ipc | |
| parent | 4304568925f8191755da36df5c61abb69db9b1b0 (diff) | |
| parent | 1c563c0006661025d7a6c9bc85fc889a4e8a1c06 (diff) | |
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android
Diffstat (limited to 'ipc')
| -rw-r--r-- | ipc/shm.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ipc/shm.c b/ipc/shm.c index 3174634ca4e5..4982a4e7f009 100644 --- a/ipc/shm.c +++ b/ipc/shm.c @@ -1083,8 +1083,8 @@ out_unlock1: * "raddr" thing points to kernel space, and there has to be a wrapper around * this. */ -long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, - unsigned long shmlba) +long do_shmat(int shmid, char __user *shmaddr, int shmflg, + ulong *raddr, unsigned long shmlba) { struct shmid_kernel *shp; unsigned long addr; @@ -1105,8 +1105,13 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr, goto out; else if ((addr = (ulong)shmaddr)) { if (addr & (shmlba - 1)) { - if (shmflg & SHM_RND) - addr &= ~(shmlba - 1); /* round down */ + /* + * Round down to the nearest multiple of shmlba. + * For sane do_mmap_pgoff() parameters, avoid + * round downs that trigger nil-page and MAP_FIXED. + */ + if ((shmflg & SHM_RND) && addr >= shmlba) + addr &= ~(shmlba - 1); else #ifndef __ARCH_FORCE_SHMLBA if (addr & ~PAGE_MASK) |