From owner-svn-src-head@FreeBSD.ORG Tue Jan 31 10:54:41 2012 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9D3531065670; Tue, 31 Jan 2012 10:54:41 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 25E988FC08; Tue, 31 Jan 2012 10:54:40 +0000 (UTC) Received: from skuns.kiev.zoral.com.ua (localhost [127.0.0.1]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id q0VAsXTo033843 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 31 Jan 2012 12:54:33 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.5/8.14.5) with ESMTP id q0VAsWqD046948; Tue, 31 Jan 2012 12:54:32 +0200 (EET) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.5/8.14.5/Submit) id q0VAsVqk046946; Tue, 31 Jan 2012 12:54:31 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Tue, 31 Jan 2012 12:54:31 +0200 From: Konstantin Belousov To: Bruce Evans , Gleb Smirnoff , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Message-ID: <20120131105431.GB3283@deviant.kiev.zoral.com.ua> References: <20120126153641.GA68112@FreeBSD.org> <20120127194612.H1547@besplex.bde.org> <20120127091244.GZ2726@deviant.kiev.zoral.com.ua> <20120127194221.GA25723@zim.MIT.EDU> <20120128123748.GD2726@deviant.kiev.zoral.com.ua> <20120129001225.GA32220@zim.MIT.EDU> <20120129062327.GK2726@deviant.kiev.zoral.com.ua> <20120129223904.GA37483@zim.MIT.EDU> <20120130063034.GU2726@deviant.kiev.zoral.com.ua> <20120130190703.GA44663@zim.MIT.EDU> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="dc+cDN39EJAMEtIO" Content-Disposition: inline In-Reply-To: <20120130190703.GA44663@zim.MIT.EDU> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.9 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: Subject: Re: svn commit: r230583 - head/sys/kern X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 31 Jan 2012 10:54:41 -0000 --dc+cDN39EJAMEtIO Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Jan 30, 2012 at 02:07:03PM -0500, David Schultz wrote: > On Mon, Jan 30, 2012, Kostik Belousov wrote: > > On Sun, Jan 29, 2012 at 05:39:04PM -0500, David Schultz wrote: > > > On Sun, Jan 29, 2012, Kostik Belousov wrote: > > > > On Sat, Jan 28, 2012 at 07:12:25PM -0500, David Schultz wrote: > > > > > On Sat, Jan 28, 2012, Kostik Belousov wrote: > > > > > > On Fri, Jan 27, 2012 at 02:42:21PM -0500, David Schultz wrote: > > > > > > > The correct limit on the maximum size of a single read/write = is > > > > > > > SSIZE_MAX, but FreeBSD uses INT_MAX. It's not safe to raise = the > > > > > > > limit yet, though, because of bugs in several filesystems. F= or > > > > > > > example, FFS copies uio_resid into a local variable of type i= nt. > > > > > > > I have some old patches that fix some of these issues for FFS= and > > > > > > > cd9660, but surely there are more places I didn't notice. > > > > > > >=20 > > > > > > Absolutely agree. > > > > > >=20 > > > > > > http://people.freebsd.org/~kib/misc/uio_resid.5.patch > > > > >=20 > > > > > Nice. You found a lot more than I've got in my tree, and you even > > > > > fixed the return values. There are at least a few more places to > > > > > fix. For instance, cd9660 and the NFS client pass uio_resid or > > > > > iov_len to min(), which operates on ints. (Incidentally, C11 > > > > > generics ought to make it possible to write type-generic min() > > > > > and max() functions.) > > > >=20 > > > > Thank you, http://people.freebsd.org/~kib/misc/uio_resid.6.patch > > > > changed them to MIN(). > > >=20 > > > This looks good to me. I tried to think of other places that you > > > might have missed, and the only one that occurred to me is the > > Might ? I think this is a blatant understate. > >=20 > > > pipe code. sys_pipe.c has an `int orig_resid' and lots of bogus > > > casts of iov_len and uio_resid to type u_int. Some look harmless, > > > although it appears that writing a multiple of 2^32 bytes might > > > result in pipe_build_write_buffer() allocating a 0-length buffer. > > >=20 > > > My only reservation is that raising the limit could unmask a > > > kernel buffer overflow if we missed something, but I guess we have > > > to cross that bridge some day anyway. > > Yes, and it is an obvious reason why I am chicken to commit this for > > so long time. One more place, if this is reasonable to count as 'one' > > place, are the cdevsw methods. devfs passes uio down to the drivers. >=20 > That's why I'm glad I'm not committing it. :) A more conservative > change (also known as "kicking the can down the road") would be to > add a VFS flag, e.g., VFCF_LONGIO, and only set it on file systems > that have been thoroughly reviewed. The VFS layer could cap the size > at INT_MAX for file systems without the flag. At least I will get more mail after the commit, I hope. I disagree with the VFCF_LONGIO approach. It will cause much head-scratching for unsuspecting user who would try to use > 4GB transfers. What I can do, is to commit all changes except removals of the checks for INT_MAX. After type changes settle, I can try to gather enough bravery to flip the checks in HEAD, possibly with temporary sysctl to return to old behaviour for emergency (AKA hole). >=20 > > diff --git a/sys/kern/sys_pipe.c b/sys/kern/sys_pipe.c > > index 9edcb74..332ec37 100644 > > --- a/sys/kern/sys_pipe.c > > +++ b/sys/kern/sys_pipe.c > [...] > > @@ -757,14 +757,14 @@ pipe_build_write_buffer(wpipe, uio) > > struct pipe *wpipe; > > struct uio *uio; > > { > > - u_int size; > > + size_t size; > > int i; > > =20 > > PIPE_LOCK_ASSERT(wpipe, MA_NOTOWNED); > > KASSERT(wpipe->pipe_state & PIPE_DIRECTW, > > ("Clone attempt on non-direct write pipe!")); > > =20 > > - size =3D (u_int) uio->uio_iov->iov_len; > > + size =3D uio->uio_iov->iov_len; > > if (size > wpipe->pipe_buffer.size) > > size =3D wpipe->pipe_buffer.size; >=20 > The transfer can't be bigger than the max pipe buffer size (64k), > so `size =3D (int)MIN(uio->uio_iov->iov_len, wpipe->pipe_buffer.size)' > should suffice. The same comment applies elsewhere in the file. True. If you much prefer this version, I will change the patch. But I do think that my changes are cleaner. --dc+cDN39EJAMEtIO Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (FreeBSD) iEYEARECAAYFAk8nyGcACgkQC3+MBN1Mb4iczwCghrxW6CzT7e+FZ7RLjtaDwvb9 RgoAnjbSiz/CPNXyIC4SgFmYvLhPlT8+ =fiGf -----END PGP SIGNATURE----- --dc+cDN39EJAMEtIO--