From owner-svn-src-all@freebsd.org Mon Jun 10 13:00:37 2019 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 187C015BE90F for ; Mon, 10 Jun 2019 13:00:37 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9908171CCC for ; Mon, 10 Jun 2019 13:00:36 +0000 (UTC) (envelope-from shawn.webb@hardenedbsd.org) Received: by mail-qt1-x843.google.com with SMTP id d23so10428924qto.2 for ; Mon, 10 Jun 2019 06:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hardenedbsd.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=lRN7kbVAT6Nw12yBGC72tDOdiVHa8pf2/I01Z4DuBFo=; b=S7zQ4f3Cb4ZN4IyK7RybvnoMh+Vba0Gcplsf8zn4tJtOlo+0T4inWFtp9omc9WayBx 0/cFp57YQYwe7f79hBb6im+2iJUQbLmBd2FnaVTOp/JH4nPbbLmMzJKlRMUmGtB25/E/ ++kbR3X0+hp1KYhRo6UqkjGQb7Kz6HDI8qmWFMd4XpCiHge9RX4JOmZlcV8uz4VInm+B 1zcJ0hZ6ZK4IPQbvY3NwfMeQoPyvWPn7g1gaPShZY9F8gK85Rv7TEnKANl4tiBwWGE0s x76Z8YD4kXHUCo8wBT7Ji7UR/WfUQSjP777VzDNErsU80KzC/tPi2ZZ9j4QHn3pdgpFA UzUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=lRN7kbVAT6Nw12yBGC72tDOdiVHa8pf2/I01Z4DuBFo=; b=CMR8Qo5ouCffaLNs80os5jJXjfcu5SaQIcxNwxXDxcd+8K0Kxo2wRulrv2GuNR7eQ9 npPx+w7R6oih0UxKKebqr8FICGNMjgYuUitMLE/HPTKscJbgkzKDkuA1xdCzwIz8Qdbm YrFgPPNjidWvLawxbpEmYAx2uBdp3ksXuZ/KfIczc17M++8QKDaLX5NCbSwwDWZYCc65 6PDmy05CqXzuDcKEfMxRPYDUzGH188GUFf2qPYxbWDNmgV1mANPhxKEXRObUj+va9K3+ AeRh30ZDcwtiHWGOi5jPJ9q93sC3u4DFrEe5dv2lFsNv/8Aqa27NPhTjH9C+5/R94ZKq 3A/g== X-Gm-Message-State: APjAAAXUquAXoZ5uJL+Y/hzDI6p/2+uxW3WLVR4AlCwES2n2/zhhUE5x Mvapid7X483kkqzZ5eiHFy7A1A== X-Google-Smtp-Source: APXvYqz6X4sPYdU81EIihgdQ8NG/LrDb8hOEN/6lQsJdOCH2hdFhH7FjLT9NL0E/lV8aESiiLHt/kQ== X-Received: by 2002:a0c:984b:: with SMTP id e11mr57683591qvd.174.1560171635481; Mon, 10 Jun 2019 06:00:35 -0700 (PDT) Received: from mutt-hbsd ([63.88.83.108]) by smtp.gmail.com with ESMTPSA id p40sm5987110qte.93.2019.06.10.06.00.34 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 10 Jun 2019 06:00:34 -0700 (PDT) Date: Mon, 10 Jun 2019 09:00:34 -0400 From: Shawn Webb To: Doug Moore Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, pho@freebsd.org Subject: Re: svn commit: r348843 - head/sys/vm Message-ID: <20190610130034.k2nzitvaxvpj5lzx@mutt-hbsd> References: <201906100307.x5A37BFt099669@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="z44yomx5hny7i4jy" Content-Disposition: inline In-Reply-To: <201906100307.x5A37BFt099669@repo.freebsd.org> X-Operating-System: FreeBSD mutt-hbsd 13.0-CURRENT-HBSD FreeBSD 13.0-CURRENT-HBSD HARDENEDBSD-13-CURRENT amd64 X-PGP-Key: http://pgp.mit.edu/pks/lookup?op=vindex&search=0xFF2E67A277F8E1FA User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 9908171CCC X-Spamd-Bar: ------ Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-6.99 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.99)[-0.989,0]; REPLY(-4.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Jun 2019 13:00:37 -0000 --z44yomx5hny7i4jy Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jun 10, 2019 at 03:07:11AM +0000, Doug Moore wrote: > Author: dougm > Date: Mon Jun 10 03:07:10 2019 > New Revision: 348843 > URL: https://svnweb.freebsd.org/changeset/base/348843 >=20 > Log: > There are times when a len=3D=3D0 parameter to mmap is okay. But on a > 32-bit machine, a len parameter just a few bytes short of 4G, rounded > up to a page boundary and hitting zero then, is not okay. Return > failure in that case. > =20 > Reported by: pho > Reviewed by: alc, kib (mentor) > Tested by: pho > Differential Revision: https://reviews.freebsd.org/D20580 >=20 > Modified: > head/sys/vm/vm_mmap.c >=20 > Modified: head/sys/vm/vm_mmap.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/sys/vm/vm_mmap.c Sun Jun 9 22:55:21 2019 (r348842) > +++ head/sys/vm/vm_mmap.c Mon Jun 10 03:07:10 2019 (r348843) > @@ -257,7 +257,10 @@ kern_mmap(struct thread *td, uintptr_t addr0, size_t= s > =20 > /* Adjust size for rounding (on both ends). */ > size +=3D pageoff; /* low end... */ > - size =3D (vm_size_t) round_page(size); /* hi end */ > + /* Check for rounding up to zero. */ > + if (round_page(size) < size) > + return (EINVAL); The mmap(2) manpage says that len=3D=3D0 results in EINVAL, so the manpage needs updating. I'm curious what "there are times" refers to. Can you or the original reporter elaborate those cases? Thanks a lot! --=20 Shawn Webb Cofounder / Security Engineer HardenedBSD Tor-ified Signal: +1 443-546-8752 Tor+XMPP+OTR: lattera@is.a.hacker.sx GPG Key ID: 0xFF2E67A277F8E1FA GPG Key Fingerprint: D206 BB45 15E0 9C49 0CF9 3633 C85B 0AF8 AB23 0FB2 --z44yomx5hny7i4jy Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEA6TL67gupaZ9nzhT/y5nonf44foFAlz+VGwACgkQ/y5nonf4 4frvGA//eQq2TpOcbjRwgfD6CI3iSLMimv3LTcxYDdmWvBEOaQYLVU4jk4gHM02F PkiHEw95AhW+YLD+Wqy62xCuzc4A9FtEjMSbIcBK3rxZ7fJzBreWCUNoFen29+3T 0qJQTf7gOE/l5XQ2Ysghi/Z3+5lpaLEuQCwjQbmgkBO+3Yl15YdJFupH9rM+RqcH /YQXUUfdwmV77N07iOpM6IGRHBVoW33D8a0LNdf7E3xrqgvd2guZnv2cnxt6FAyZ 213Rj44nvs1zkBerYuT1n1aEHEcvaSGv+8Cok9iaF5vQHfIsj2kkko2pvawF/RsJ Oo79JaYueU6+nGq87Tb7V/Z0EGDN3nvrbPbWM1TZXf7spT7SZOwb/tE098GPtG2w o6YCZTdxtDEMlApGK4yT3lCPBfhrmL4NdQ8bla5KyxjwubtZImdjuDlcFHIrmIJF FNk8az1+kapJcJmpbSJ0DI79N1YjdS/uUhP+et99GxYfzU80VeYiLYgAmXs3Xfbc ffwpelv5gxlav+VaT2WHYru0xxOklADd2zHkhrmsGYg5sP5wg7gM5+AYvHF763nU F5xa8vMyCHh5lvrd7ZZjcaDhrbqtztMWStCuZAfZ6cAbbT686FFtblYmuCT1QulR AH/nfS2f/8/cftLvSpbGArAt2v6GVBCh02CwlIdF7lz7bcSbyTA= =kEQg -----END PGP SIGNATURE----- --z44yomx5hny7i4jy--