From: "Michael Kerrisk (man-pages)" <mtk.manpages@gmail.com>
To: Manfred Spraul <manfred@colorfullife.com>,
Davidlohr Bueso <davidlohr.bueso@hp.com>,
Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: mtk.manpages@gmail.com, LKML <linux-kernel@vger.kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>,
KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
gthelen@google.com, aswin@hp.com, linux-mm@kvack.org
Subject: Re: [PATCH 1/4] ipc/shm.c: check for ulong overflows in shmat
Date: Wed, 23 Apr 2014 06:58:15 +0200 [thread overview]
Message-ID: <53574867.5010108@gmail.com> (raw)
In-Reply-To: <1398090397-2397-2-git-send-email-manfred@colorfullife.com>
On 04/21/2014 04:26 PM, Manfred Spraul wrote:
> find_vma_intersection does not work as intended if addr+size overflows.
> The patch adds a manual check before the call to find_vma_intersection.
>
> Signed-off-by: Manfred Spraul <manfred@colorfullife.com>
> ---
> ipc/shm.c | 3 +++
> 1 file changed, 3 insertions(+)
>
> diff --git a/ipc/shm.c b/ipc/shm.c
> index 7645961..382e2fb 100644
> --- a/ipc/shm.c
> +++ b/ipc/shm.c
> @@ -1160,6 +1160,9 @@ long do_shmat(int shmid, char __user *shmaddr, int shmflg, ulong *raddr,
> down_write(¤t->mm->mmap_sem);
> if (addr && !(shmflg & SHM_REMAP)) {
> err = -EINVAL;
> + if (addr + size < addr)
> + goto invalid;
> +
> if (find_vma_intersection(current->mm, addr, addr + size))
> goto invalid;
> /*
>
Acked-by: Michael Kerrisk <mtk.manpages@gmail.com>
--
Michael Kerrisk
Linux man-pages maintainer; http://www.kernel.org/doc/man-pages/
Linux/UNIX System Programming Training: http://man7.org/training/
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2014-04-23 5:05 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-21 14:26 [PATCH 0/4] ipc/shm.c: increase the limits for SHMMAX, SHMALL Manfred Spraul
2014-04-21 14:26 ` [PATCH 1/4] ipc/shm.c: check for ulong overflows in shmat Manfred Spraul
2014-04-21 14:26 ` [PATCH 2/4] ipc/shm.c: check for overflows of shm_tot Manfred Spraul
2014-04-21 14:26 ` [PATCH 3/4] ipc/shm.c: check for integer overflow during shmget Manfred Spraul
2014-04-21 14:26 ` [PATCH 4/4] ipc/shm.c: Increase the defaults for SHMALL, SHMMAX Manfred Spraul
2014-04-22 18:21 ` Davidlohr Bueso
2014-04-22 18:28 ` Davidlohr Bueso
2014-04-22 20:17 ` Motohiro Kosaki
2014-04-23 5:01 ` Michael Kerrisk (man-pages)
2014-04-22 18:19 ` [PATCH 3/4] ipc/shm.c: check for integer overflow during shmget Davidlohr Bueso
2014-04-22 20:16 ` Motohiro Kosaki
2014-04-23 4:59 ` Michael Kerrisk (man-pages)
2014-04-22 18:18 ` [PATCH 2/4] ipc/shm.c: check for overflows of shm_tot Davidlohr Bueso
2014-04-22 20:16 ` Motohiro Kosaki
2014-04-23 4:58 ` Michael Kerrisk (man-pages)
2014-04-22 18:18 ` [PATCH 1/4] ipc/shm.c: check for ulong overflows in shmat Davidlohr Bueso
2014-04-22 20:15 ` Motohiro Kosaki
2014-04-23 4:58 ` Michael Kerrisk (man-pages) [this message]
2014-04-21 17:25 ` [PATCH 0/4] ipc/shm.c: increase the limits for SHMMAX, SHMALL Davidlohr Bueso
2014-04-22 4:23 ` Manfred Spraul
2014-04-22 18:18 ` Davidlohr Bueso
2014-04-23 2:53 ` [PATCH 5/4] ipc,shm: minor cleanups Davidlohr Bueso
2014-04-23 5:07 ` Michael Kerrisk (man-pages)
2014-04-23 5:25 ` Davidlohr Bueso
2014-04-23 5:28 ` Michael Kerrisk (man-pages)
2014-04-23 22:27 ` Andrew Morton
2014-04-23 22:35 ` Stephen Rothwell
2014-04-24 5:18 ` Michael Kerrisk (man-pages)
2014-04-24 17:21 ` Davidlohr Bueso
2014-04-23 18:18 ` Manfred Spraul
2014-05-02 13:16 ` [PATCH 0/4] ipc/shm.c: increase the limits for SHMMAX, SHMALL Michael Kerrisk (man-pages)
2014-05-06 20:06 ` Davidlohr Bueso
2014-05-06 20:40 ` Michael Kerrisk (man-pages)
2014-05-06 22:08 ` Davidlohr Bueso
2014-05-07 5:27 ` Michael Kerrisk (man-pages)
2014-05-07 18:22 ` Davidlohr Bueso
2014-05-07 19:17 ` [PATCH v2] ipc,shm: document new limits in the uapi header Davidlohr Bueso
2014-05-09 8:44 ` Michael Kerrisk (man-pages)
2014-05-11 20:46 ` Davidlohr Bueso
2014-05-12 7:44 ` Michael Kerrisk (man-pages)
2014-05-13 1:35 ` Davidlohr Bueso
2014-05-13 6:06 ` Michael Kerrisk (man-pages)
2014-05-06 20:43 ` [PATCH 0/4] ipc/shm.c: increase the limits for SHMMAX, SHMALL Davidlohr Bueso
2014-06-03 19:26 ` Davidlohr Bueso
2014-09-23 5:24 ` Michael Kerrisk (man-pages)
2014-09-24 8:02 ` Davidlohr Bueso
-- strict thread matches above, loose matches on Subject: below --
2014-04-19 11:43 Manfred Spraul
2014-04-19 11:43 ` [PATCH 1/4] ipc/shm.c: check for ulong overflows in shmat Manfred Spraul
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53574867.5010108@gmail.com \
--to=mtk.manpages@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=aswin@hp.com \
--cc=davidlohr.bueso@hp.com \
--cc=gthelen@google.com \
--cc=kamezawa.hiroyu@jp.fujitsu.com \
--cc=kosaki.motohiro@jp.fujitsu.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=manfred@colorfullife.com \
--cc=schwidefsky@de.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).