From e4778cf3d319e2b0343ad3066a581ad25fa22c35 Mon Sep 17 00:00:00 2001 From: Guy Streeter Date: Tue, 8 May 2007 00:25:12 -0700 Subject: [PATCH] --- yaml --- r: 54567 b: refs/heads/master c: af7c693f146069a1f44739acef9abf1bc27f7247 h: refs/heads/master i: 54565: 375ad9e9178b8b7d9e37b05626267194fce770c6 54563: e52e7b693b4b74ee6dcd05ca12bf2986b54c975a 54559: cc9afafcf33062d2f2347e83c3ff78a9ccd7ee5e v: v3 --- [refs] | 2 +- trunk/ipc/compat.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5e011f7c3d3b..78698c911693 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ee527cd3a20c2aeaac17d939e5d011f7a76d69f5 +refs/heads/master: af7c693f146069a1f44739acef9abf1bc27f7247 diff --git a/trunk/ipc/compat.c b/trunk/ipc/compat.c index fa18141539fb..8b44aa9a7c95 100644 --- a/trunk/ipc/compat.c +++ b/trunk/ipc/compat.c @@ -542,6 +542,8 @@ static inline int put_compat_shminfo64(struct shminfo64 *smi, if (!access_ok(VERIFY_WRITE, up64, sizeof(*up64))) return -EFAULT; + if (smi->shmmax > INT_MAX) + smi->shmmax = INT_MAX; err = __put_user(smi->shmmax, &up64->shmmax); err |= __put_user(smi->shmmin, &up64->shmmin); 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))) return -EFAULT; + if (smi->shmmax > INT_MAX) + smi->shmmax = INT_MAX; err = __put_user(smi->shmmax, &up->shmmax); err |= __put_user(smi->shmmin, &up->shmmin); err |= __put_user(smi->shmmni, &up->shmmni);