diff options
author | Guy Streeter <streeter@redhat.com> | 2007-05-08 03:25:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-05-08 14:15:00 -0400 |
commit | af7c693f146069a1f44739acef9abf1bc27f7247 (patch) | |
tree | 424f1417dd3c7ace9323aaca4b7b757c8bb7af03 /ipc | |
parent | ee527cd3a20c2aeaac17d939e5d011f7a76d69f5 (diff) |
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>
Diffstat (limited to 'ipc')
-rw-r--r-- | ipc/compat.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ipc/compat.c b/ipc/compat.c index fa18141539fb..8b44aa9a7c95 100644 --- a/ipc/compat.c +++ b/ipc/compat.c | |||
@@ -542,6 +542,8 @@ static inline int put_compat_shminfo64(struct shminfo64 *smi, | |||
542 | 542 | ||
543 | if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) | 543 | if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) |
544 | return -EFAULT; | 544 | return -EFAULT; |
545 | if (smi->shmmax > INT_MAX) | ||
546 | smi->shmmax = INT_MAX; | ||
545 | err = __put_user(smi->shmmax, &up64->shmmax); | 547 | err = __put_user(smi->shmmax, &up64->shmmax); |
546 | err |= __put_user(smi->shmmin, &up64->shmmin); | 548 | err |= __put_user(smi->shmmin, &up64->shmmin); |
547 | err |= __put_user(smi->shmmni, &up64->shmmni); | 549 | err |= __put_user(smi->shmmni, &up64->shmmni); |
@@ -557,6 +559,8 @@ static inline int put_compat_shminfo(struct shminfo64 *smi, | |||
557 | 559 | ||
558 | if (!access_ok(VERIFY_WRITE, up, sizeof(*up))) | 560 | if (!access_ok(VERIFY_WRITE, up, sizeof(*up))) |
559 | return -EFAULT; | 561 | return -EFAULT; |
562 | if (smi->shmmax > INT_MAX) | ||
563 | smi->shmmax = INT_MAX; | ||
560 | err = __put_user(smi->shmmax, &up->shmmax); | 564 | err = __put_user(smi->shmmax, &up->shmmax); |
561 | err |= __put_user(smi->shmmin, &up->shmmin); | 565 | err |= __put_user(smi->shmmin, &up->shmmin); |
562 | err |= __put_user(smi->shmmni, &up->shmmni); | 566 | err |= __put_user(smi->shmmni, &up->shmmni); |