From nobody Mon Apr 6 16:52:21 2026 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 4fqFjy5cdMz6YLF3 for ; Mon, 06 Apr 2026 16:52:22 +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 4fqFjy1lCqz442x for ; Mon, 06 Apr 2026 16:52:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1775494342; 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=vaW4G4rT+2jwk674hvLqwE3MopWHIDBxFNE/NtJADjU=; b=dQl3kJ1efVBX/ewqAzqc92xy0Mh1ecSOl5DYxSq+DjBLWQI39cWShTYT5pmKskBlHLqigM Qyhos+NDz3Zk5VJA4ZF7xOS5DRjO8DzASzksynv2zrJjyzPfvslmiryIKu7e64BDHs7dj2 Up/zKNIN7VfvVt++0dcRcCBciLpd9yW+K8IFiDrivxA7PUvhEHMOvhUowNT06+qpegLv9j OsHwC1T8+hm8mvgEPqhzrMn5UlX+IsH/lzkj1DcBhm1Hg5msD3VNdKvm1gaM63V5L9Vzpw NQ853mtRHr+W0duD8IP+oz6JIpGjbCcV8Ojx3Q4nUTD7od8RI90iPQzhGGl0Rg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1775494342; a=rsa-sha256; cv=none; b=adv2vzgfm5epmJxQfUkHx6eSZhyy/I0/+pDAGOiUClTzSctzuWZHC2zKEJBHho3n8+08f7 ln7l0DkgvWLJVza8znyxXgwjaBgs///jr0PZJCvbkuvKxTS/EA+4x4vSGmcAlaOMkj0NBi EYcV8yOjtoihL2rL2Jt23lwV/HNBSmHytryd33OYMrb0IHXORmS2NZ/YFAen9IlMftqVGH mqtD4uCqy6gnYgnFS+ELgEx413fFrdkCMawIVox0W8KNbcpUNIK5OSwvHREUC7EbUe6gF3 T8qsFcwxb2OFG3VjQfAc/logEYNlv1uTbymIPJI51Yn2Lr/cpFPfJm4p3rl0VA== 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=1775494342; 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=vaW4G4rT+2jwk674hvLqwE3MopWHIDBxFNE/NtJADjU=; b=hXqoocwT7fs17aYQcZErydFYRwN62J7c6PRW3DjG+ug3SEem8dvLQiV4aoiZSDCkuT9vpt ziXZsPMREm/ns3ioaN5WGQLpX+v7iaMRorxRLTYNAKKHLorKnf8yZa/bsIKBNrWRH4VKEu P/4KOTrkTYP5tKlBE1eKdqGcGEn4SEkXMnbAX4ay+c3iqBdTPXz2VqZovX491Ua+HrUcrw Fr5fjAjo3Neqkvo/rOm/mi4maHgjc2q0kKgQJtl6Top8nKPMQL3uw/zRYwuuRVkDIiZBLy mLBaMLwU1x7xtgIRsUNvIJpGCt1Syignw8i0liOSaZaMaSb76jtvMimwCVTqaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fqFjx6bHXz12Hd for ; Mon, 06 Apr 2026 16:52:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a5dc by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Apr 2026 16:52:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0c0e08be01a7 - stable/15 - diff: handle read(2) failures 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/15 X-Git-Reftype: branch X-Git-Commit: 0c0e08be01a755061eff1f85e7f8bed966fbe0bf Auto-Submitted: auto-generated Date: Mon, 06 Apr 2026 16:52:21 +0000 Message-Id: <69d3e4c5.1a5dc.21858103@gitrepo.freebsd.org> The branch stable/15 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0c0e08be01a755061eff1f85e7f8bed966fbe0bf commit 0c0e08be01a755061eff1f85e7f8bed966fbe0bf Author: Baptiste Daroussin AuthorDate: 2026-03-26 09:25:21 +0000 Commit: Baptiste Daroussin CommitDate: 2026-04-06 16:51:46 +0000 diff: handle read(2) failures MFC After: 1 week (cherry picked from commit 9b98c4b053917cad42e26596b37df72efab6dc39) --- 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"));