From nobody Wed Mar 02 21:57:37 2022 X-Original-To: dev-commits-src-all@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 E6EA019E0E2C; Wed, 2 Mar 2022 21:57:41 +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 4K87Jh5gzdz3KfC; Wed, 2 Mar 2022 21:57:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258261; 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=+gJqENZxPR3MRSH9soS0a/j1YrRiXD+8k1sHS1hjSMU=; b=mRkQj+GR6SNJJfmc1DRcCFiKbhlPF5orT/ZY/n+Hxn31zPZM+maUsyos8kkz24VPKOR6dl iR/LcxgW8AsufCNK1qWEVVpp6RCf9qVeZ3p7eGMl5Orok24jzWup64aCQSYqvypV5fGTBU 0kRIoHSfwEQ5ouVsw3k3b1FXv3yPohFj6gQBNBYOlR07Yq2cJ0ihWACcctZtZiXWgLCDhC oPf+8rhSgC4TqRJhFVr27zy/986dSIWxOluylAH6T8e3DjLInNeIiOajI1PgXpT6BqwbN3 /Vu4R5gc5LFjzxeV2Toz2NcUu9c9ESzFbKCCY1QIPtfgPPQCgXyWQ1DAJArBHA== 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 8AEF53842; Wed, 2 Mar 2022 21:57:37 +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 222LvbB3065468; Wed, 2 Mar 2022 21:57:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222Lvbj7065467; Wed, 2 Mar 2022 21:57:37 GMT (envelope-from git) Date: Wed, 2 Mar 2022 21:57:37 GMT Message-Id: <202203022157.222Lvbj7065467@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eric van Gyzen Subject: git: 6887791e1869 - stable/13 - efivar: handle error when reading --fromfile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vangyzen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6887791e1869a70fe2ea9b20a29f066add4d6b5c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258261; 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=+gJqENZxPR3MRSH9soS0a/j1YrRiXD+8k1sHS1hjSMU=; b=aknC8Xw5Rx1SvBBWoWGZsnJr1n1GiNr6EZakWLsLSFoyp+7ex1w+0cMidNia/BHPLfb6su Kp+9rh2+kLZi/kXXxGkqLjgw18b2pwZhOOdsFMwiUdaec7JmEEOL/dbvOqrwGHKk8YQZ5W ksBVnU29gA9fC+8qENzJcx535HUieVrSv7zOzwi3YKV4bH/PY1w9S9o+i3Kyo7AIdgjxbh FHk1wQfnQk6xY1hteUwv0Baqekiz8sUZjeO1UocP2g88yLQt02gyDxkhoxUu+xOfpjaPr5 TvnF4OdNWwbgKGNVhTcgOlJUdE/nvROSSldXQh6CwjwWTbIsI1RfxExLFYU0rQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646258261; a=rsa-sha256; cv=none; b=qxFOcu2MnYHjqWXTpUP14xbBcbckQfgcROoFt4qIe1Uk06TDJXqwYhWKekqBdVuggtshYy 2wLSCdDUe4CILTE1QBbHJIsK2R2vATxow/RJ2wvI2anRg5u6p1ReL2nJ5iAAK7W75TdlAm ENwQC7mjg2cdkVBul/ZmBpdtRX4Svj/9NbFxHtc1l3iFuaXatkB7r7Ow9fnLr1SQ27degW 3YS68v+vywbPtMQwA3fhUkUtdoCfEAtU7Ka7nO82VaF++sLnJ+nJiyZFTxPwxuetOopgB3 fs9zhD42mbyT7HvXl45AN6vTreiq6LAzn08ynBTGUUA8npf8o1CGFLxkKvG57Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by vangyzen: URL: https://cgit.FreeBSD.org/src/commit/?id=6887791e1869a70fe2ea9b20a29f066add4d6b5c commit 6887791e1869a70fe2ea9b20a29f066add4d6b5c Author: Eric van Gyzen AuthorDate: 2022-02-23 18:15:34 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-02 21:56:31 +0000 efivar: handle error when reading --fromfile The result of read() was stored in an unsigned variable, so the test for a negative value would never work. While I'm here, print a better error message for an empty file, omitting the misleading errno message. Reported by: Coverity MFC after: 1 week Sponsored by: Dell EMC Isilon (cherry picked from commit d0f4e583bff67e2bdd816549c460da6daa3f67b1) --- usr.sbin/efivar/efivar.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/usr.sbin/efivar/efivar.c b/usr.sbin/efivar/efivar.c index eb9a6e0257c8..5bdf0c11a488 100644 --- a/usr.sbin/efivar/efivar.c +++ b/usr.sbin/efivar/efivar.c @@ -239,8 +239,10 @@ print_var(efi_guid_t *guid, char *name) if (data == NULL) rep_err(1, "malloc"); datalen = read(fd, data, 64 * 1024); - if (datalen <= 0) + if ((ssize_t)datalen < 0) rep_err(1, "read"); + if (datalen == 0) + rep_errx(1, "empty file"); close(fd); } else { rv = efi_get_variable(*guid, name, &data, &datalen, &att);