git: 9e6158d27482 - main - uefisign: fix handling of errors from child proc

Eric van Gyzen vangyzen at FreeBSD.org
Tue Apr 6 17:14:03 UTC 2021


The branch main has been updated by vangyzen:

URL: https://cgit.FreeBSD.org/src/commit/?id=9e6158d274829249322efb3767e6ac2e690cc4a9

commit 9e6158d274829249322efb3767e6ac2e690cc4a9
Author:     Eric van Gyzen <vangyzen at FreeBSD.org>
AuthorDate: 2021-04-06 14:36:52 +0000
Commit:     Eric van Gyzen <vangyzen at FreeBSD.org>
CommitDate: 2021-04-06 17:13:59 +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
---
 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");


More information about the dev-commits-src-all mailing list