d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Some linux distros put mount point into the ext2fs labels, such as '/', or

Browse Source 
'/boot', which confuses the devfs code and can cause userland programs to
fail reading /dev/ext2fs directory with weird error code, such as any
program that uses pwlib.

Strip any leading slashes before feeding the label to the geom_label code.

Sponsored by:	Sippy Software, Inc.

MFC after:	1 week
This commit is contained in:
Maxim Sobolev 2011-03-08 17:00:31 +00:00
parent e84c2db137
commit 20cc2dc42e
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/geom/label/g_label_ext2fs.c
View File

@ -53,6 +53,7 @@ g_label_ext2fs_taste(struct g_consumer *cp, char *label, size_t size)
{
struct g_provider *pp;
e2sb_t *fs;
char *s_volume_name;
g_topology_assert_not();
pp = cp->provider;
@ -74,13 +75,18 @@ g_label_ext2fs_taste(struct g_consumer *cp, char *label, size_t size)
goto exit_free;
}
s_volume_name = fs->s_volume_name;
/* Terminate label */
s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
if (s_volume_name[0] == '/')
s_volume_name += 1;
/* Check for volume label */
if (fs->s_volume_name[0] == '\0')
if (s_volume_name[0] == '\0')
goto exit_free;
/* Terminate label */
fs->s_volume_name[sizeof(fs->s_volume_name) - 1] = '\0';
strlcpy(label, fs->s_volume_name, size);
strlcpy(label, s_volume_name, size);
exit_free:
g_free(fs);