public inbox for cygwin-cvs@sourceware.org
help / color / mirror / Atom feed
From: Ken Brown <kbrown@sourceware.org>
To: cygwin-cvs@sourceware.org
Subject: [newlib-cygwin] Cygwin: mmap: fix mapping beyond EOF on 64 bit
Date: Mon, 20 Jul 2020 16:08:00 +0000 (GMT)	[thread overview]
Message-ID: <20200720160800.43E5B3851C39@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=d8a8d2ce5953af3383aff019596bdf7f7aef6c41

commit d8a8d2ce5953af3383aff019596bdf7f7aef6c41
Author: Ken Brown <kbrown@cornell.edu>
Date:   Mon Jul 20 08:59:09 2020 -0400

    Cygwin: mmap: fix mapping beyond EOF on 64 bit
    
    Commit 605bdcd410384dda6db66b9b8cd19e863702e1bb enabled mapping beyond
    EOF in 64 bit environments.  But the variable 'orig_len' did not get
    rounded up to a multiple of 64K.  This rounding was done on 32 bit
    only.  Fix this by rounding up orig_len on 64 bit, in the same place
    where 'len' is rounded up.
    
    Rounding up is needed to make sigbus_page_len a multiple of the
    allocation granularity.
    
    In addition, failing to round up could cause orig_len to be smaller
    than len.  Since these are both unsigned values, the statement
    'orig_len -= len' could then cause orig_len to be huge, and mmap would
    fail with errno EFBIG.
    
    I observed this failure while debugging the problem reported in
    
      https://sourceware.org/pipermail/cygwin/2020-July/245557.html.
    
    The failure can be seen by running the test case in that report under
    gdb or strace.

Diff:
---
 winsup/cygwin/mmap.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/winsup/cygwin/mmap.cc b/winsup/cygwin/mmap.cc
index feb9e5d0e..a08d00f83 100644
--- a/winsup/cygwin/mmap.cc
+++ b/winsup/cygwin/mmap.cc
@@ -1144,6 +1144,7 @@ go_ahead:
 	 ends in, but there's nothing at all we can do about that. */
 #ifdef __x86_64__
       len = roundup2 (len, wincap.allocation_granularity ());
+      orig_len = roundup2 (orig_len, wincap.allocation_granularity ());
 #else
       len = roundup2 (len, wincap.is_wow64 () ? wincap.allocation_granularity ()
 					      : wincap.page_size ());


                 reply	other threads:[~2020-07-20 16:08 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20200720160800.43E5B3851C39@sourceware.org \
    --to=kbrown@sourceware.org \
    --cc=cygwin-cvs@sourceware.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 read-only IMAP folder(s) and NNTP newsgroup(s).