From owner-svn-src-all@freebsd.org Sat May 9 06:57:48 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3CCD92DE73A; Sat, 9 May 2020 06:57:48 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smarthost1.greenhost.nl (smarthost1.greenhost.nl [195.190.28.88]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 49Jygt6wFfz4M24; Sat, 9 May 2020 06:57:46 +0000 (UTC) (envelope-from ronald-lists@klop.ws) Received: from smtp.greenhost.nl ([213.108.110.112]) by smarthost1.greenhost.nl with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1jXJQe-00051U-IH; Sat, 09 May 2020 08:57:45 +0200 Content-Type: text/plain; charset=utf-8; format=flowed; delsp=yes To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org, "Toomas Soome" Subject: Re: svn commit: r360836 - head/stand/libsa/zfs References: <202005090625.0496PLvc091232@repo.freebsd.org> Date: Sat, 09 May 2020 08:57:41 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: "Ronald Klop" Message-ID: In-Reply-To: <202005090625.0496PLvc091232@repo.freebsd.org> User-Agent: Opera Mail/12.16 (FreeBSD) X-Authenticated-As-Hash: 398f5522cb258ce43cb679602f8cfe8b62a256d1 X-Virus-Scanned: by clamav at smarthost1.samage.net X-Spam-Level: / X-Spam-Score: -0.2 X-Spam-Status: No, score=-0.2 required=5.0 tests=ALL_TRUSTED, BAYES_50 autolearn=disabled version=3.4.2 X-Scan-Signature: bbdeaaa4d227adae8d620e69c05793d6 X-Rspamd-Queue-Id: 49Jygt6wFfz4M24 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of ronald-lists@klop.ws designates 195.190.28.88 as permitted sender) smtp.mailfrom=ronald-lists@klop.ws X-Spamd-Result: default: False [-2.51 / 15.00]; ARC_NA(0.00)[]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; FROM_HAS_DN(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; R_SPF_ALLOW(-0.20)[+ip4:195.190.28.64/27]; TO_MATCH_ENVRCPT_ALL(0.00)[]; MIME_GOOD(-0.10)[text/plain]; MIME_TRACE(0.00)[0:+]; DMARC_NA(0.00)[klop.ws]; TO_DN_SOME(0.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; IP_SCORE(-0.71)[ip: (-0.55), ipnet: 195.190.28.0/24(-0.22), asn: 47172(-2.80), country: NL(0.03)]; RCVD_IN_DNSWL_NONE(0.00)[88.28.190.195.list.dnswl.org : 127.0.10.0]; FROM_EQ_ENVFROM(0.00)[]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_VERYGOOD(0.00)[88.28.190.195.rep.mailspike.net : 127.0.0.19]; ASN(0.00)[asn:47172, ipnet:195.190.28.0/24, country:NL]; MID_RHS_NOT_FQDN(0.50)[]; RCVD_TLS_ALL(0.00)[]; RCVD_COUNT_TWO(0.00)[2] X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.32 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: Sat, 09 May 2020 06:57:48 -0000 Hi Toomas, Could this fix this issue https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=144234 ? Regards, Ronald. On Sat, 09 May 2020 08:25:21 +0200, Toomas Soome wrote: > Author: tsoome > Date: Sat May 9 06:25:20 2020 > New Revision: 360836 > URL: https://svnweb.freebsd.org/changeset/base/360836 > > Log: > loader: vdev_read() can corrupt memory > When reading less than sector size but from sector boundary, > the vdev_read() will read full sector into the provided buffer > and therefore corrupting memory past buffer end. > MFC after: 2 days > > Modified: > head/stand/libsa/zfs/zfs.c > > Modified: head/stand/libsa/zfs/zfs.c > ============================================================================== > --- head/stand/libsa/zfs/zfs.c Sat May 9 05:04:02 2020 (r360835) > +++ head/stand/libsa/zfs/zfs.c Sat May 9 06:25:20 2020 (r360836) > @@ -418,7 +418,7 @@ vdev_read(vdev_t *vdev, void *priv, off_t offset, > void > full_sec_size -= secsz; > /* Return of partial sector data requires a bounce buffer. */ > - if ((head > 0) || do_tail_read) { > + if ((head > 0) || do_tail_read || bytes < secsz) { > bouncebuf = malloc(secsz); > if (bouncebuf == NULL) { > printf("vdev_read: out of memory\n"); > @@ -442,14 +442,28 @@ vdev_read(vdev_t *vdev, void *priv, off_t offset, > void > outbuf += min(secsz - head, bytes); > } > - /* Full data return from read sectors */ > + /* > + * Full data return from read sectors. > + * Note, there is still corner case where we read > + * from sector boundary, but less than sector size, e.g. reading 512B > + * from 4k sector. > + */ > if (full_sec_size > 0) { > - res = read(fd, outbuf, full_sec_size); > - if (res != full_sec_size) { > - ret = EIO; > - goto error; > + if (bytes < full_sec_size) { > + res = read(fd, bouncebuf, secsz); > + if (res != secsz) { > + ret = EIO; > + goto error; > + } > + memcpy(outbuf, bouncebuf, bytes); > + } else { > + res = read(fd, outbuf, full_sec_size); > + if (res != full_sec_size) { > + ret = EIO; > + goto error; > + } > + outbuf += full_sec_size; > } > - outbuf += full_sec_size; > } > /* Partial data return from last sector */ > _______________________________________________ > svn-src-all@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-all > To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"