From: Yann Droneaud <ydroneaud@opteya.com>
To: Sagi Grimberg <sagig@dev.mellanox.co.il>
Cc: Roland Dreier <roland@kernel.org>,
linux-rdma@vger.kernel.org,
Shachar Raindel <raindel@mellanox.com>,
Jack Morgenstein <jackm@mellanox.com>,
Or Gerlitz <ogerlitz@mellanox.com>,
stable@vger.kernel.org
Subject: Re: [PATCH v1 2/2] IB/core: don't disallow registering region starting at 0x0
Date: Tue, 14 Apr 2015 14:00:59 +0200 [thread overview]
Message-ID: <1429012859.4333.2.camel@opteya.com> (raw)
In-Reply-To: <552CDBD6.1020205@dev.mellanox.co.il>
Hi,
Le mardi 14 avril 2015 à 12:20 +0300, Sagi Grimberg a écrit :
> On 4/13/2015 3:56 PM, Yann Droneaud wrote:
> > In a call to ib_umem_get(), if address is 0x0 and size is
> > already page aligned, check added in commit 8494057ab5e4
> > ("IB/uverbs: Prevent integer overflow in ib_umem_get address
> > arithmetic") will refuse to register a memory region that
> > could otherwise be valid (provided vm.mmap_min_addr sysctl
> > and mmap_low_allowed SELinux knobs allow userspace to map
> > something at address 0x0).
> >
> > This patch allows back such registration: ib_umem_get()
> > should probably don't care of the base address provided it
> > can be pinned with get_user_pages().
> >
> > There's two possible overflows, in (addr + size) and in
> > PAGE_ALIGN(addr + size), this patch keep ensuring none
> > of them happen while allowing to pin memory at address
> > 0x0. Anyway, the case of size equal 0 is no more (partially)
> > handled as 0-length memory region are disallowed by an
> > earlier check.
> >
> > Link: http://mid.gmane.org/cover.1428929103.git.ydroneaud@opteya.com
> > Cc: <stable@vger.kernel.org> # 8494057ab5e4 ("IB/uverbs: Prevent integer overflow in ib_umem_get address arithmetic")
> > Cc: Shachar Raindel <raindel@mellanox.com>
> > Cc: Jack Morgenstein <jackm@mellanox.com>
> > Cc: Or Gerlitz <ogerlitz@mellanox.com>
> > Signed-off-by: Yann Droneaud <ydroneaud@opteya.com>
> > ---
> > drivers/infiniband/core/umem.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/infiniband/core/umem.c b/drivers/infiniband/core/umem.c
> > index 9ac4068d2088..38acb3cfc545 100644
> > --- a/drivers/infiniband/core/umem.c
> > +++ b/drivers/infiniband/core/umem.c
> > @@ -106,8 +106,8 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr,
> > * If the combination of the addr and size requested for this memory
> > * region causes an integer overflow, return error.
> > */
> > - if ((PAGE_ALIGN(addr + size) <= size) ||
> > - (PAGE_ALIGN(addr + size) <= addr))
> > + if (((addr + size) < addr) ||
> > + PAGE_ALIGN(addr + size) < (addr + size))
>
> If you do change the first statement to be: (addr + size) <= addr
> wouldn't it cover patch #1?
>
Yes, but it doesn't sound a great place to do it: here it's about
overflow, so I'd prefer not doing the null memory region check there.
Regards.
--
Yann Droneaud
OPTEYA
next prev parent reply other threads:[~2015-04-14 12:00 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-04-13 12:56 [PATCH v1 0/2] Fixes on top of CVE-2014-8159 kernel: infiniband: uverbs: unprotected physical memory access Yann Droneaud
[not found] ` <cover.1428929103.git.ydroneaud-RlY5vtjFyJ3QT0dZR+AlfA@public.gmane.org>
2015-04-13 12:56 ` [PATCH v1 1/2] IB/core: disallow registering 0-sized memory region Yann Droneaud
2015-04-13 12:56 ` [PATCH v1 2/2] IB/core: don't disallow registering region starting at 0x0 Yann Droneaud
2015-04-14 9:20 ` Sagi Grimberg
2015-04-14 12:00 ` Yann Droneaud [this message]
[not found] ` <1429012859.4333.2.camel-RlY5vtjFyJ3QT0dZR+AlfA@public.gmane.org>
2015-04-14 12:50 ` Sagi Grimberg
[not found] ` <552D0D2A.8000604-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2015-04-14 14:35 ` Haggai Eran
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=1429012859.4333.2.camel@opteya.com \
--to=ydroneaud@opteya.com \
--cc=jackm@mellanox.com \
--cc=linux-rdma@vger.kernel.org \
--cc=ogerlitz@mellanox.com \
--cc=raindel@mellanox.com \
--cc=roland@kernel.org \
--cc=sagig@dev.mellanox.co.il \
--cc=stable@vger.kernel.org \
/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