git: 23ecfa9d5bc4 - main - kern: mountroot: avoid fd leak in .md parsing

[Kyle Evans]

The branch main has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=23ecfa9d5bc4f04eb58e26018c2d15f032d5d742

commit 23ecfa9d5bc4f04eb58e26018c2d15f032d5d742
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-07-20 10:23:11 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-07-21 15:18:09 +0000

    kern: mountroot: avoid fd leak in .md parsing
    
    parse_dir_md() opens /dev/mdctl but only closes the resulting fd on
    success, not upon failure of the ioctl or when we exceed the md unit
    max.
    
    Reviewed by:    kib (slightly previous version)
    Sponsored by:   NetApp, Inc.
    Sponsored by:   Klara, Inc.
    X-NetApp-PR:    #62
    Differential Revision:  https://reviews.freebsd.org/D31229
---
 sys/kern/vfs_mountroot.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sys/kern/vfs_mountroot.c b/sys/kern/vfs_mountroot.c
index 65d52cc68bcd..48753b8c6a96 100644
--- a/sys/kern/vfs_mountroot.c
+++ b/sys/kern/vfs_mountroot.c
@@ -580,6 +580,7 @@ parse_dir_md(char **conf)
 	int error, fd, len;
 
 	td = curthread;
+	fd = -1;
 
 	error = parse_token(conf, &tok);
 	if (error)
@@ -635,9 +636,9 @@ parse_dir_md(char **conf)
 	root_mount_mddev = mdio->md_unit;
 	printf(MD_NAME "%u attached to %s\n", root_mount_mddev, mdio->md_file);
 
-	error = kern_close(td, fd);
-
  out:
+	if (fd >= 0)
+		(void)kern_close(td, fd);
 	free(mdio, M_TEMP);
 	return (error);
 }