From nobody Thu Mar 26 09:26:28 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 4fhJLd4lr9z6WcKc for ; Thu, 26 Mar 2026 09:26:33 +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 4fhJLd2mncz3x7D for ; Thu, 26 Mar 2026 09:26:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774517193; 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=IsMRLk0TI7kH8SeTHTvcAWcLNdXUwWWrV0vlfmlBOxjCBR6OHA9mZwFTuMDo4/aGbo0DzN sky28a8fGcCdRkStrQzX2v8d861/3B/xAgoRIWCaWgkEvO1DL+5anaClXJaJQsJHWIJYQT dbOoHM15Hqm0ucoZb99wM1+BghRdGJN9PWUCv3QBJYIT3jDesDxDIrSd1F6tqvW3l2plRm hN7obvnWdx3E5Zt1WfOZOiiQduTOAlI0QQWc/WC0sEDtlutlrgaJTImeVjVoBCw5xJXsUw FNkGS7YHFdE8WiZ349WvQUWk8tdxewnqKOyqWqqWnZ/GsddLPg1IEuxdQlN89Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774517193; a=rsa-sha256; cv=none; b=igEu0uguhjS52IYfuZy26UYyeR/GNTAipsBY+ZwXLZhxqVqO1rlFbZlnsBo/lgLGDFcdZm sIXrIGJklsiHkSqzsTvOBIekCqe0tgGnBsemi+BxNJeQ7o98oV6gxO3rs4kvakZMdSKoAX pY+94KGD02eCyRYMclJ4+ruzh3glAMR8dyYPA1fil3e/M5YAVt0zQtzBtezO7nxqFwT4uf fak2J5LiMSy/OVx2LBvqgPKsYTXvNmb01fd3q4TlemyVFWtl6nW/ymfVx1OCdM0W4u+yGZ 0uWb2c8NR8XLVMWqpsm4Pg2p8Le8HseJhw7TvLjv6XulIZQyKxS4uH1CiAANKA== 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=1774517193; 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=Zy022IHPbJ+fONGWPJUaZXp2ni+bywnKpUJ1JbZzCb3EYzAuVdaF0cZND0yWuyplFREOGP oQ5g+Epe6bK4CRNa2vRIXbpydLSXt5e1v09inrH+uBn/tUdMoLFgrc2Q52EHrxKMRMuHAZ QHXS/Ary5IAxayGIqgTQZDDBqafAnEdASE4I3VNqWJeNJOkSMqCttErlV+E7zjSfU8ai5n x8m8MNAfsWbGeTzA5Qyj1qUCje8fRVs0eKutoFZ7XNFt3fmYy+WRu2nLPKavup2BeEtGvR SofB7vATNfZ7hMCfSuumZBzilmWsmQyRqvCdBz/nB0DmepMH7XxOAiOpEHtmdw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fhJLd2BlgzmQc for ; Thu, 26 Mar 2026 09:26:33 +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 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/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"));