From nobody Wed Mar 02 21:57:13 2022 X-Original-To: dev-commits-src-branches@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 D134A19E0680; Wed, 2 Mar 2022 21:57:13 +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 4K87J95WZcz3KDd; Wed, 2 Mar 2022 21:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258233; 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=gfRdRj/S5CZXBd3/nIW33YIU/WMpKXM1fvytITMtgwI=; b=foHQ3cRHoHchsN0q0yr9R58NU+E3aggt39piYU4ha9BKWAj3eeXucCqfLkTl+Ai0WUkf5H Y1GLFS1aAFpg6lknZl+iDqWqtkho8KIgwVqCDwSMBYciMheZfs9blEh+gI8c214HIW4jkA Pa1QADE7h30rou8jN2olyfT8SfT3GCcF4Obv++b0yP9LFuFHIGj0eO8xFIR0QqZfxewh7B VhRKQxSFwpmpBzZi8CVCgjwDpSltjq3hmifNTGM20bykHwVIDS7VnxNSUR++gOZl/kCuYm 5/jaX2sU5yfH5yB8QcxGdZ2Gu22Ut8e4Zv0oxoXHQfZDMTWjynsDzzwZG0ZYeQ== 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 9D56437C2; Wed, 2 Mar 2022 21:57:13 +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 222LvDr2064938; Wed, 2 Mar 2022 21:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 222LvDDd064937; Wed, 2 Mar 2022 21:57:13 GMT (envelope-from git) Date: Wed, 2 Mar 2022 21:57:13 GMT Message-Id: <202203022157.222LvDDd064937@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: 858c11b39cc5 - stable/13 - uefisign: fix handling of errors from child proc List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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: 858c11b39cc5619371ade0ab4237cca6e9bb2060 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1646258233; 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=gfRdRj/S5CZXBd3/nIW33YIU/WMpKXM1fvytITMtgwI=; b=ihWxbw9QWpYqcvYPcX2SmY2vs0op1r5CGj92dBuZp8Mo9rRWC0zIUFbCKglrM/1zChQ9yR bto14urDsYU4QJi7X6tFW9gJMF3zGf026bFz+5fm009zBVvrWKdf8cL6L614LAQjEzoa7n oJ9TgwQmlY7wnc4R5ut0EqAUQNlHAdOZ6kcZKc4yu4Pfr9XivdpvV7Ig2HBxuI4TckUzfo c/IZhsR+eV30erFLukuDnK0EsnA7azrldJ2qnokzWIVWR+Mi9HhqKCWLlFcygYcpy3mxRP JkkZ8qW6v+lBL+Yk83MtvN6477cjOmsmgd65DCJgV0iL6IH98Ud4fa+qwKBFfA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1646258233; a=rsa-sha256; cv=none; b=OryDT/Ix8NZbMoky7FQ06xy4oCzLnJH8oYLI+QucGac1uncOtoWo2E1upKJB5VcdsNUryr M6cRNPZUI7U9AKxHsxfH3vm2jYorrWa2zmcvm8+8WlMNnhy4HDghxwzUAglaiJOv4LSLfi NAqau9QN4jbDFnlL7OBWUh157FRYUk0M1x5rXjG+4cUIyuOkOsUPQX8Y0qazehTEWDsppQ TVV2Y6LNwOg4yM5JEeKnmQ2X3mzDQ0QMu4VNkEoQ8sV3MQxtZ9hovtchVRedo8gUgn04yq cNo7Rkf+3YtEqJ7JRQsplehBbwNTqN2qmbI6cxojtDFwCTez94Fleg2x2b0P/w== 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=858c11b39cc5619371ade0ab4237cca6e9bb2060 commit 858c11b39cc5619371ade0ab4237cca6e9bb2060 Author: Eric van Gyzen AuthorDate: 2021-04-06 14:36:52 +0000 Commit: Eric van Gyzen CommitDate: 2022-03-02 21:56:29 +0000 uefisign: fix handling of errors from child proc Close the unused pipe file descriptors so the parent will notice if the child exits prematurely. Previously, the parent would block forever on a read from the pipe. $ uefisign -c foo.cert -k foo.key -o loader.efi loader.efi.unsigned uefisign: section points inside the headers load: 0.06 cmd: uefisign 4502 [piperd] 7.25r 0.00u 0.00s 0% 5968k ... _sleep+0x1be pipe_read+0x3d6 kern_readv+0x8c sys_read+0x83 ... Reviewed by: trasz MFC after: 1 week Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D29605 (cherry picked from commit 9e6158d274829249322efb3767e6ac2e690cc4a9) --- usr.sbin/uefisign/uefisign.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/usr.sbin/uefisign/uefisign.c b/usr.sbin/uefisign/uefisign.c index 149e90ba0e67..7eab934c3394 100644 --- a/usr.sbin/uefisign/uefisign.c +++ b/usr.sbin/uefisign/uefisign.c @@ -410,8 +410,12 @@ main(int argc, char **argv) if (pid < 0) err(1, "fork"); - if (pid == 0) + if (pid == 0) { + close(pipefds[0]); exit(child(inpath, outpath, pipefds[1], Vflag, vflag)); + } + + close(pipefds[1]); if (!Vflag) { certfp = checked_fopen(certpath, "r");