Cap shmmax at INT_MAX in compat shminfo
The value of shmmax may be larger than will fit in the struct used by the 32bit compat version of sys_shmctl. This change mirrors what the normal sys_shmctl does when called with the old IPC_INFO command. Signed-off-by: Guy Streeter <streeter@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ee527cd3a2
commit
af7c693f14
|
@ -542,6 +542,8 @@ static inline int put_compat_shminfo64(struct shminfo64 *smi,
|
||||||
|
|
||||||
if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64)))
|
if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64)))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
if (smi->shmmax > INT_MAX)
|
||||||
|
smi->shmmax = INT_MAX;
|
||||||
err = __put_user(smi->shmmax, &up64->shmmax);
|
err = __put_user(smi->shmmax, &up64->shmmax);
|
||||||
err |= __put_user(smi->shmmin, &up64->shmmin);
|
err |= __put_user(smi->shmmin, &up64->shmmin);
|
||||||
err |= __put_user(smi->shmmni, &up64->shmmni);
|
err |= __put_user(smi->shmmni, &up64->shmmni);
|
||||||
|
@ -557,6 +559,8 @@ static inline int put_compat_shminfo(struct shminfo64 *smi,
|
||||||
|
|
||||||
if (!access_ok(VERIFY_WRITE, up, sizeof(*up)))
|
if (!access_ok(VERIFY_WRITE, up, sizeof(*up)))
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
if (smi->shmmax > INT_MAX)
|
||||||
|
smi->shmmax = INT_MAX;
|
||||||
err = __put_user(smi->shmmax, &up->shmmax);
|
err = __put_user(smi->shmmax, &up->shmmax);
|
||||||
err |= __put_user(smi->shmmin, &up->shmmin);
|
err |= __put_user(smi->shmmin, &up->shmmin);
|
||||||
err |= __put_user(smi->shmmni, &up->shmmni);
|
err |= __put_user(smi->shmmni, &up->shmmni);
|
||||||
|
|
Loading…
Reference in New Issue