Skip to contentSkip to conversation

proto: fix file descriptor leak

PATCH In review Luca Di Maio 2 participants 4 messages Oct 24, 2025 – Oct 25, 2025

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 proto: fix file descriptor leak

fix leak of pathfd introduced in commit 8a4ea72724930cfe262ccda03028264e1a81b145

---
 mkfs/proto.c | 1 +
 1 file changed, 1 insertion(+)
mkfs/proto.c +1 -0
index 2b29240d..1a7b3586 100644
@@ -1772,6 +1772,7 @@ handle_direntry(
 	create_nondir_inode(mp, pip, fsxp, mode, creds, xname, flags, file_stat,
 			    rdev, fd, fname);
 out:
+	close(pathfd);
 	/* Reset path_buf to original */
 	path_buf[path_len] = '\0';
 }

--
2.51.0

#1 lore raw

Hi all,
I apologize for introducing a file descriptor leak in commit 8a4ea727. The pathfd was not being properly closed.

I've submitted a fix (v1 patch) that adds the missing close() call. I'd deeply sorry for the oversight.

L.

Quoted 21 lines · Luca Di Maio

fix leak of pathfd introduced in commit 8a4ea72724930cfe262ccda03028264e1a81b145

---
 mkfs/proto.c | 1 +
 1 file changed, 1 insertion(+)
mkfs/proto.c +1 -1
index 2b29240d..1a7b3586 100644
@@ -1772,6 +1772,7 @@ handle_direntry(
 	create_nondir_inode(mp, pip, fsxp, mode, creds, xname, flags, file_stat,
 			    rdev, fd, fname);
 out:
+	close(pathfd);
 	/* Reset path_buf to original */
 	path_buf[path_len] = '\0';
 }
--

2.51.0

Reviewed-by on v1 1/1
#2 lore raw
In reply to Luca Di Maio
Quoted 3 lines · Luca Di Maio

fix leak of pathfd introduced in commit 8a4ea72724930cfe262ccda03028264e1a81b145

A few points:

First, everyone makes mistakes, don't worry about it. :)

Second, the canonical format for kernel-ish formats is most probably something like:

Cc <[email protected]> # v6.17.0
Fixes 8a4ea72724930c ("proto: add ability to populate a filesystem from a directory")

but this is xfsprogs, so there isn't any formally established convention aside from "Darrick copies the kernel style and the complaining hasn't been harsh enough for him to stop".

Third, does anyone actually have a script to generate these git trailers? I set user.stableSubmissionTarget = [email protected] in gitconfig and use this:

#!/bin/bash

# Cite a list of git hashes in Fixes: tag format.

if [ -z "$1" ] || [ "$1" = "--help" ]; then

	echo "Usage: $0 commit [commits...]"
	exit 1

fi

stable_email="$(git config user.stableSubmissionTarget)"

# Find the most recent version tag for this commit. Assumes that version tags

# start with v and a digit.
tag_for_commit() {
	local arg="$1"
	local tag
	local release_tag
	local rc_suffix
	local version_prefix
	# Find the first tag created after this commit.
	version_prefix="$(git config versionsort.prefix)"
	test -z "${version_prefix}" && version_prefix="v"
	tag="$(git tag -l --contains "${arg}" --sort version:refname | \
		grep "^${version_prefix}[0-9]" | \
		head -n 1)"
	test -z "${tag}" && return 1

	# Strip off any version suffix (presumably "-rcX") to construct what
	# ought to be the tag name for the final release.
	rc_suffix="$(git config versionsort.suffix)"
	# shellcheck disable=SC2001
	release_tag="$(echo "${tag}" | sed -e "s/${rc_suffix}.*//g")"

	# If the release tag actually exists, print that instead of the first
	# tag.  Otherwise, print that first tag.  We'd rather print "v5.4" than
	# the more accurate "v5.4-rc1" because stable backports target
	# releases, not -rcX.
	if [ -n "$(git tag -l "${release_tag}" 2>/dev/null)" ]; then
		echo "${release_tag}"
	else
		echo "${tag}"
	fi
	return 0
}

gitlog=(git log --format='Fixes: %h ("%s")')
for arg in "$@"; do

	if [ -n "${stable_email}" ]; then
		fixed_in="$(tag_for_commit "${arg}")" && \
			echo "Cc: <${stable_email}> # ${fixed_in}"
	fi
	"${gitlog[@]}" "${arg}^1..${arg}"

done

--D

Quoted 18 lines
---
 mkfs/proto.c | 1 +
 1 file changed, 1 insertion(+)
mkfs/proto.c +1 -1
index 2b29240d..1a7b3586 100644
@@ -1772,6 +1772,7 @@ handle_direntry(
 	create_nondir_inode(mp, pip, fsxp, mode, creds, xname, flags, file_stat,
 			    rdev, fd, fname);
 out:
+	close(pathfd);
 	/* Reset path_buf to original */
 	path_buf[path_len] = '\0';
 }
--

2.51.0

#3 lore raw
Quoted 9 lines · Darrick J. Wong
Quoted 3 lines · Luca Di Maio

fix leak of pathfd introduced in commit 8a4ea72724930cfe262ccda03028264e1a81b145

A few points:

First, everyone makes mistakes, don't worry about it. :)

Thanks Darrick :)

Quoted 10 lines

Second, the canonical format for kernel-ish formats is most probably something like:

Cc <[email protected]> # v6.17.0
Fixes 8a4ea72724930c ("proto: add ability to populate a filesystem from a directory")

but this is xfsprogs, so there isn't any formally established convention aside from "Darrick copies the kernel style and the complaining hasn't been harsh enough for him to stop".

If it's needed I can re-rubmit with the new commit message, let me know

Thanks
L.

Quoted 19 lines
Quoted 19 lines
---
 mkfs/proto.c | 1 +
 1 file changed, 1 insertion(+)
mkfs/proto.c +1 -1
index 2b29240d..1a7b3586 100644
@@ -1772,6 +1772,7 @@ handle_direntry(
 	create_nondir_inode(mp, pip, fsxp, mode, creds, xname, flags, file_stat,
 			    rdev, fd, fname);
 out:
+	close(pathfd);
 	/* Reset path_buf to original */
 	path_buf[path_len] = '\0';
 }
--

2.51.0