Skip to contentSkip to conversation

Btrfs-progs: check return value of realpath(3)

PATCH In review Eryu Guan 2 participants 3 messages Oct 12, 2013 – Oct 16, 2013 Btrfs file system

lore
Share & tools
lore

Eryu Guan

author
#0 lore raw

PATCH 1/1 Btrfs-progs: check return value of realpath(3)

I hit a segfault when deleting a subvolume with very long name(>4096), it's because cmd_subvol_delete() calls strdup() and passes NULL as argument, which is returned by realpath(3).

I used the following script to reproduce

	#!/bin/bash
	mnt=$1
	i=1
	path=$mnt/subvol_$i

	# Create very deep subvolumes
	while btrfs sub create $path;do
	      ((i++))
	      path="$path/subvol_$i"
	done
	last_vol=$(dirname $path)
	dir=$(dirname $last_vol)
	vol=$(basename $last_vol)

	# Try to delete tha last one, this would get segfault
	pushd $dir
	btrfs sub delete $vol
	popd

Fix it by checking return value of realpath(3), also fix the one in find_mount_root().

---
 cmds-send.c      | 8 ++++++--
 cmds-subvolume.c | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)
cmds-send.c +6 -2
index 0057e6b..9e4d031 100644
@@ -62,6 +62,7 @@ int find_mount_root(const char *path, char **mount_root)
 	int fd;
 	struct mntent *ent;
 	int len;
+	int ret;
 	int longest_matchlen = 0;
 	char *longest_match = NULL;
 
@@ -91,10 +92,13 @@ int find_mount_root(const char *path, char **mount_root)
 		return -ENOENT;
 	}
 
+	ret = 0;
 	*mount_root = realpath(longest_match, NULL);
-	free(longest_match);
+	if (!mount_root)
+		ret = -errno;
 
-	return 0;
+	free(longest_match);
+	return ret;
 }
 
 static int get_root_id(struct btrfs_send *s, const char *path, u64 *root_id)
cmds-subvolume.c +6 -0
index ccb4762..f7249f8 100644
@@ -225,6 +225,12 @@ again:
 	}
 
 	cpath = realpath(path, 0);
+	if (!cpath) {
+		ret = errno;
+		fprintf(stderr, "ERROR: finding real path for '%s': %s\n",
+			path, strerror(errno));
+		goto out;
+	}
 	dname = strdup(cpath);
 	dname = dirname(dname);
 	vname = strdup(cpath);
Signature · 1 line
1.8.3.1
#1 lore raw
Quoted 1 line · Eryu Guan

I hit a segfault when deleting a subvolume with very long name(>4096),

How do you get a valid pathname longer than PATH_MAX which is 4096 ?

Quoted 2 lines

Fix it by checking return value of realpath(3), also fix the one in find_mount_root().

The error handling itself is ok.

david

author
#2 lore raw
Quoted 4 lines · David Sterba
Quoted 1 line · Eryu Guan

I hit a segfault when deleting a subvolume with very long name(>4096),

How do you get a valid pathname longer than PATH_MAX which is 4096 ?

Just as the steps in reproducer, you can try the following

path=/mnt/btrfs
for i in seq 1 381;do

	path="$path/subvol_$i"
	btrfs sub create $path

done
echo ${#path} # len is 4093 here

((i++))
path="$path/subvol_$i"
btrfs sub create $path
echo ${#path} # The length of absolute path of this subvolume is greater than 4096 now

Maybe just another bug of btrfs-progs?

Quoted 5 lines
Quoted 3 lines

Fix it by checking return value of realpath(3), also fix the one in find_mount_root().

The error handling itself is ok.

Thanks for the review!

Eryu