From nobody Wed May 10 09:26:45 2023 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 4QGV5y0yTcz49cqn; Wed, 10 May 2023 09:26:46 +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 4QGV5y0RMHz4T22; Wed, 10 May 2023 09:26:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710806; 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=16ZQ6VF3Uv9jDGjw3A/r6ZornZIkfB1yS890sUL1fvY=; b=PjTt4+cA5Nnm5xX+WQlnzzFgFZLdGdYKPK85PETHuK0Ii7YdSmzpVCCaXDFN2IAuNrEQav hWOD4ywe6kKP29hhEW2IqeKlewXP4wLZGW4fzjchyl+XPGs1RJTVpYKfb/2+DQ2pZGqlQh VR5T5pBpZXppLjooMXjbjGP+ZjhAmYjQJSOlLkUqSBQvFn6+Xgcr3/t5vZFiRnqMv+OZdO EZX6Q/7Wo6tyBN6PJoH2b0WKcB2Ve1uCqOKg72tUMvGZWvZGZ3gw+3yQZlwbvhhnVA9Q1i B6WxLZB+YK8xA8ql9yKu30Lfs5u32n5RoGI2Ifa+2YVlGayd/EvD6rSgg+xVxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683710806; 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=16ZQ6VF3Uv9jDGjw3A/r6ZornZIkfB1yS890sUL1fvY=; b=i/J9a9mVBKQ2pSJYg8c+grgsgHr32lZR2y3V6YX6a+7mj/dTsUI2t54YnVIJ40haIma9XB 6KoEpJH7WpGq7rRH/90us8FInyywrLYc4SN7LUDJu1+Rk+upHk5TAGvwKT2s5+0z+IqVXM 7z44GRD2F9HOE/GL/2ib9vazGZ8xFi68SzqqRwMJXiGVcEQnyagPCU/bxXKdM+TVfuZAgF E286zD0yU9E6R2UO+ofeIhA6EwStex8HAs12LrvvIyyhyApyo1jjHbAPIDeds5g12SQyeR h8MQQRcQVzD7HPecvDAbE4WxAWRynAuGWJis0lUxH4+L1TR54UYHeH+XbdogFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683710806; a=rsa-sha256; cv=none; b=lK3WTAS2KPM2f1wn/QNPH/k1Dadh1VN+6COfruAfym5aHsxgKYHM06a0W1Dl8l+zy4Q1pS uhvlkVRAVkEi6fdrBPFs4l9Ew2ydlTOgYlPia7l2eShmHriswIn+RN26vFiB6TcDHuq7Np cftUcvPsoY7hxUP2GLwNB1weVrxTMhGAnJQn+W0gm0y76AZ4scJZ/KGxOav/H0xpDpK1h2 yjk4L9FryJzMd9mpe8bkFYwgNDBV8Q/7/Ct0CRdaxC97rUf/GBP7TI1wbJMmSbIsVWleAB hj+jyOZdYXDb/txbI+gD0wWRx50WvkxJwPuEl2XROxsM+v9ZjO0F+3kK2tC/qA== 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 4QGV5x6ZyGz14nG; Wed, 10 May 2023 09:26:45 +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 34A9QjKn092799; Wed, 10 May 2023 09:26:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34A9Qj7T092798; Wed, 10 May 2023 09:26:45 GMT (envelope-from git) Date: Wed, 10 May 2023 09:26:45 GMT Message-Id: <202305100926.34A9Qj7T092798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: =?utf-8?Q?Dag-Erling=20Sm=C3=B8rgrav?= Subject: git: f1ceb05a469f - main - md5: Fix input error check. 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: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 commit f1ceb05a469ffe03f25aeea5f9f72a6d8f75bcd1 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-09 17:59:13 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-05-10 09:25:21 +0000 md5: Fix input error check. Fixes: 4849767cb16a MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: tsoome, kevans, lwhsu Differential Revision: https://reviews.freebsd.org/D40017 --- sbin/md5/md5.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbin/md5/md5.c b/sbin/md5/md5.c index 98cfb37110d5..bca6a98fc32c 100644 --- a/sbin/md5/md5.c +++ b/sbin/md5/md5.c @@ -686,7 +686,7 @@ MDInput(const Algorithm_t *alg, FILE *f, char *buf, bool tee) switch (input_mode) { case input_binary: case input_text: - if (tee && fwrite(block, 1, len, stdout) != (size_t)len) + if (tee && fwrite(block, 1, len, stdout) != len) err(1, "stdout"); alg->Update(&context, block, len); break; @@ -734,7 +734,7 @@ MDInput(const Algorithm_t *alg, FILE *f, char *buf, bool tee) break; } } - if (len < 0) { + if (ferror(f)) { alg->End(&context, buf); return (NULL); }