From nobody Thu Jan 26 19:47:58 2023 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P2rpl2f6bz3bnTp; Thu, 26 Jan 2023 19:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P2rpl0nfzz3DBG; Thu, 26 Jan 2023 19:47:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Q7TLr6Q5omP45wJnuOvf+MG5dcFFfk8xnDBg9+sN30=; b=P1d1gjip9b0YoBV83qhXjGso9Zn1OjgQ6xtJFTs55cnd38KUwVfSqBsR//Nhehj8MCt6pw DTlJmztC1ddmRoWpPY5RpQL9dgVP4sNk+kxBe5+wR91iokAq2kK1Vi4PmQj63CbuLHrS0S qOnBwng+f/6h+dKb+nQxjO4kiE/ydj0V5AiUJflxyI3n6GQogxgMvo0jI8oDctWY41IRe+ MWWQ41nxreTADBhvKWe2xuLdMs1FLKE84DJuZN7O0UmxQWFx120roghaUUF5YeBXhRtwFi sUo/h15X+Y9FchjSil22bq2JP0yq3pmbrzXF7Xh9/knk3jyRd7hqxim/WXspEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674762479; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4Q7TLr6Q5omP45wJnuOvf+MG5dcFFfk8xnDBg9+sN30=; b=siPDP5yv76h0tHO3zv8X8yg3n20+0mRvSRrMWx2TMxP5iWK8ZEVkgRN861Tupuosdj2Rwi qaxQUsBMMMNmpFXebaYftRYy0dFu/i4iL4iN2SvXZmGj9FjoipEhorc1xFZ2Yxquhs76YF 3vErqC/ZxiadG7ecM85LNC2472cP8Xeu3S6vsQWS55Omi1V0+LWHDmGOEhJ4nfNUMBdol5 oK1l30euOI9U71vDWOURKgHv1yRZTOHfwuimfTp/Foxk4Z9rzysWdHDVsFrSb+9RLWiuZK rtYyXg2RXRGoxgCozFRsE+K1nSz7HDqFO1pSJWcJ8u2+w/r4sHgkAQG2HczehA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674762479; a=rsa-sha256; cv=none; b=byXStPBZ/XRCsK/iiWOX8k3cJe6IOSkFN+wfrn6A9dXYSjLVpX95Moi9ixeCrv0xXqcmS8 2P2cixTOPN0d93naRaltZSKlGPsgEK3sVdISVMW4rHhhuS9rU3qFVWZLmDVMnTzD0lhAV2 EmqBLtThlqXatgWR2rizB6DQ6Pjc2omaCXJ8Al6+zJgXLKag0Gbqte816vwQdvsAN/cZV7 CL2gF1QIp+CpcVkIyU21R+EiKP8YZ7WEyYg+xqmfkaoP5P/DsqM/WQ5+68NwOwlv9V8Gtg HP4P+0delyjhPw2I7WJlOgAxalL6+zVhjRZNVOfD8VCz3ryemRXMEnjkX4yhrw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P2rpk6n3jzhWd; Thu, 26 Jan 2023 19:47:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30QJlw7A007350; Thu, 26 Jan 2023 19:47:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30QJlww6007349; Thu, 26 Jan 2023 19:47:58 GMT (envelope-from git) Date: Thu, 26 Jan 2023 19:47:58 GMT Message-Id: <202301261947.30QJlww6007349@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: c369cdd69656 - stable/13 - bhyve: Address warnings in blockif_proc() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c369cdd696568cc037958413ead78f7225193302 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=c369cdd696568cc037958413ead78f7225193302 commit c369cdd696568cc037958413ead78f7225193302 Author: Mark Johnston AuthorDate: 2022-10-25 13:16:23 +0000 Commit: John Baldwin CommitDate: 2023-01-26 19:42:43 +0000 bhyve: Address warnings in blockif_proc() - Use unsigned types for all arithmetic. Use a new signed variable for holding the return value of pread() and pwrite(). - Handle short I/O from pwrite(). MFC after: 1 week (cherry picked from commit 46f5c828961e64646c46ff9e3bc8e55f46f3e7bb) --- usr.sbin/bhyve/block_if.c | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 558a1629f074..a13f7f0744c6 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -235,32 +235,36 @@ blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be, uint8_t *buf) { struct blockif_req *br; off_t arg[2]; - ssize_t clen, len, off, boff, voff; + ssize_t n; + size_t clen, len, off, boff, voff; int i, err; br = be->be_req; + assert(br->br_resid >= 0); + if (br->br_iovcnt <= 1) buf = NULL; err = 0; switch (be->be_op) { case BOP_READ: if (buf == NULL) { - if ((len = preadv(bc->bc_fd, br->br_iov, br->br_iovcnt, - br->br_offset)) < 0) + if ((n = preadv(bc->bc_fd, br->br_iov, br->br_iovcnt, + br->br_offset)) < 0) err = errno; else - br->br_resid -= len; + br->br_resid -= n; break; } i = 0; off = voff = 0; while (br->br_resid > 0) { len = MIN(br->br_resid, MAXPHYS); - if (pread(bc->bc_fd, buf, len, br->br_offset + - off) < 0) { + n = pread(bc->bc_fd, buf, len, br->br_offset + off); + if (n < 0) { err = errno; break; } + len = (size_t)n; boff = 0; do { clen = MIN(len - boff, br->br_iov[i].iov_len - @@ -285,11 +289,11 @@ blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be, uint8_t *buf) break; } if (buf == NULL) { - if ((len = pwritev(bc->bc_fd, br->br_iov, br->br_iovcnt, - br->br_offset)) < 0) + if ((n = pwritev(bc->bc_fd, br->br_iov, br->br_iovcnt, + br->br_offset)) < 0) err = errno; else - br->br_resid -= len; + br->br_resid -= n; break; } i = 0; @@ -311,13 +315,14 @@ blockif_proc(struct blockif_ctxt *bc, struct blockif_elem *be, uint8_t *buf) } boff += clen; } while (boff < len); - if (pwrite(bc->bc_fd, buf, len, br->br_offset + - off) < 0) { + + n = pwrite(bc->bc_fd, buf, len, br->br_offset + off); + if (n < 0) { err = errno; break; } - off += len; - br->br_resid -= len; + off += n; + br->br_resid -= n; } break; case BOP_FLUSH: