From nobody Thu Mar 26 09:26:28 2026 X-Original-To: dev-commits-src-main@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 4fhJLX2WDbz6WcKZ for ; Thu, 26 Mar 2026 09:26:28 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fhJLX1jfMz3wwH for ; Thu, 26 Mar 2026 09:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774517188; 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=SAhB/yTHtFFolOZ7aqffHMfVagrwZbJm9FonmyyG8R0=; b=MdTCq4L4tpT5vABRX8nfAgVdaEJFr+9zUDqKFYOdofK4SX8dNbKNLOhJmraqPzR3lsYCyB 0vAVNUZ4XzccHwRCeemCquvrU1gqUqTlK3df0rTPUUPNMn3i1E99jsftoU/9nosz42ACcd w/t/XiUEnYekDKoYLI/7/MylAHYaAenjGmx96YM6zuYwTbD+syb26d1EcMeXVMg5IIMOKM rugpmijFDjagcwBooongg7mrtIiO92BaD+kI4kIpxstjr7fdfNe/25DfBQ29r1SfiFqp72 NTvS1jFzvxUXQBZHDQn7DqDEGonW1QzBg5tSw1BR8mQywm5l3O3hWGh/GHuj3g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774517188; a=rsa-sha256; cv=none; b=xiXdtaugaeRIJ96jembN51t9Cy5q41YDOh9KAxldvSDKtNj1bc3yrZkQK+DMWS8QFHNoS9 vbzqUMUVWcNe3zr0DEpKGUaJPMDn2gRd+ShGKiM2647rLzyhC33cPWf+gb93DuSipa8iEE ruFtLgAnU7J4qYgeX7TmYtkyEeZsTkIZDW4mN4kos1T4xKRG7F1sd5NiQ0/MXaI6LDbxy0 zDys7xu9ay1Jnf4EXHzHVSzKDk/aOiN4tWVICWZFQ5aVjWBailVUTXMZYnCN99S1MRt/VD W4tb5W9nAKATcE+MzkD/EE48B0i3wmFGliicyb963yPvUmA8n50YXBjKOVxDeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774517188; 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=SAhB/yTHtFFolOZ7aqffHMfVagrwZbJm9FonmyyG8R0=; b=wFgr92zOlpBzZEW4WqP3s60HPFZcdY1xTo4QIXQtH7eWA4SxThRn0buWN7v3UhKtpQn2HV HyV8Tf30s1PjGuJaibAUcc9m7oMOhtHKQfVwM9JimI9E5xrs0zJaDLWLIn5V5QZvyGUc9n 7WSZzMS9p7KbUYK7rcdGEQrxD9GMeRBl2yoMr/4w7QACXQKQ8D+O8l4XPqOJwQ66oPH7NV dujKnVGfdCjP8BvEsKMADZPS1ER1o2hRmxMhGq3EcvExWhP289FYA/RYyIZm/QNLiK5yHW GaZk2mnFb+4iWky8D2Z1UN929oj/XpLlvEqF6DhvRYijwXAi5ta1fZQn/VpT4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhJLX1HXZzm7s for ; Thu, 26 Mar 2026 09:26:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 259cd by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 26 Mar 2026 09:26:28 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 9b98c4b05391 - main - diff: handle read(2) failures List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9b98c4b053917cad42e26596b37df72efab6dc39 Auto-Submitted: auto-generated Date: Thu, 26 Mar 2026 09:26:28 +0000 Message-Id: <69c4fbc4.259cd.32759fbc@gitrepo.freebsd.org> The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=9b98c4b053917cad42e26596b37df72efab6dc39 commit 9b98c4b053917cad42e26596b37df72efab6dc39 Author: Baptiste Daroussin AuthorDate: 2026-03-26 09:25:21 +0000 Commit: Baptiste Daroussin CommitDate: 2026-03-26 09:25:50 +0000 diff: handle read(2) failures MFC After: 1 week --- usr.bin/diff/diffreg.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c index 8dcf55a7190b..5c1147bf2730 100644 --- a/usr.bin/diff/diffreg.c +++ b/usr.bin/diff/diffreg.c @@ -542,6 +542,11 @@ opentemp(const char *f) return (NULL); } } + if (nread == -1) { + close(ifd); + close(ofd); + return (NULL); + } close(ifd); lseek(ofd, (off_t)0, SEEK_SET); return (fdopen(ofd, "r"));