From: Kees Cook <keescook@chromium.org>
To: "Isaac J. Manjarres" <isaacm@codeaurora.org>
Cc: Chris von Recklinghausen <crecklin@redhat.com>,
Linux-MM <linux-mm@kvack.org>,
LKML <linux-kernel@vger.kernel.org>,
Sodagudi Prasad <psodagud@codeaurora.org>,
tsoni@codeaurora.org, "# 3.4.x" <stable@vger.kernel.org>
Subject: Re: [PATCH] mm/usercopy: Use memory range to be accessed for wraparound check
Date: Wed, 14 Nov 2018 17:32:21 -0600 [thread overview]
Message-ID: <CAGXu5j+pRq1m=UNtkz0U-pvsdf=zT5is0LWdk77QkgGfxK_mGw@mail.gmail.com> (raw)
In-Reply-To: <1542156686-12253-1-git-send-email-isaacm@codeaurora.org>
On Tue, Nov 13, 2018 at 6:51 PM, Isaac J. Manjarres
<isaacm@codeaurora.org> wrote:
> Currently, when checking to see if accessing n bytes starting at
> address "ptr" will cause a wraparound in the memory addresses,
> the check in check_bogus_address() adds an extra byte, which is
> incorrect, as the range of addresses that will be accessed is
> [ptr, ptr + (n - 1)].
>
> This can lead to incorrectly detecting a wraparound in the
> memory address, when trying to read 4 KB from memory that is
> mapped to the the last possible page in the virtual address
> space, when in fact, accessing that range of memory would not
> cause a wraparound to occur.
I'm kind of surprised anything is using the -4K memory range -- this
is ERR_PTR() area and I'd expect there to be an explicit unallocated
memory hole here.
>
> Use the memory range that will actually be accessed when
> considering if accessing a certain amount of bytes will cause
> the memory address to wrap around.
>
> Change-Id: I2563a5988e41122727ede17180f365e999b953e6
> Fixes: f5509cc18daa ("mm: Hardened usercopy")
> Co-Developed-by: Prasad Sodagudi <psodagud@codeaurora.org>
> Signed-off-by: Prasad Sodagudi <psodagud@codeaurora.org>
> Signed-off-by: Isaac J. Manjarres <isaacm@codeaurora.org>
> Cc: stable@vger.kernel.org
Regardless, I'll take it in my tree if akpm doesn't grab it first. :)
Acked-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> mm/usercopy.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/mm/usercopy.c b/mm/usercopy.c
> index 852eb4e..0293645 100644
> --- a/mm/usercopy.c
> +++ b/mm/usercopy.c
> @@ -151,7 +151,7 @@ static inline void check_bogus_address(const unsigned long ptr, unsigned long n,
> bool to_user)
> {
> /* Reject if object wraps past end of memory. */
> - if (ptr + n < ptr)
> + if (ptr + (n - 1) < ptr)
> usercopy_abort("wrapped address", NULL, to_user, 0, ptr + n);
>
> /* Reject if NULL or ZERO-allocation. */
> --
> The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
> a Linux Foundation Collaborative Project
>
--
Kees Cook
next prev parent reply other threads:[~2018-11-14 23:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-14 0:51 [PATCH] mm/usercopy: Use memory range to be accessed for wraparound check Isaac J. Manjarres
2018-11-14 10:35 ` William Kucharski
2018-11-14 11:09 ` David Laight
2018-11-14 11:46 ` William Kucharski
2018-11-14 17:32 ` isaacm
2018-11-14 22:50 ` William Kucharski
2018-11-14 23:27 ` Kees Cook
2018-11-14 23:32 ` Kees Cook [this message]
2018-11-15 7:05 ` Sasha Levin
2019-07-30 17:54 Isaac J. Manjarres
2019-07-31 20:25 ` Kees Cook
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='CAGXu5j+pRq1m=UNtkz0U-pvsdf=zT5is0LWdk77QkgGfxK_mGw@mail.gmail.com' \
--to=keescook@chromium.org \
--cc=crecklin@redhat.com \
--cc=isaacm@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=psodagud@codeaurora.org \
--cc=stable@vger.kernel.org \
--cc=tsoni@codeaurora.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;
as well as URLs for NNTP newsgroup(s).