diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-14 21:23:33 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2009-04-14 21:23:33 +0000 |
| commit | 32a3d084d32dfc827ffa736959f4fe9834ef528c (patch) | |
| tree | d47f675f7ac137fd8f54b68f3a0bb59b75adba7e /util-linux | |
| parent | 7223424815b2ce563553ff35342e84b4a14d8d8b (diff) | |
| download | busybox-32a3d084d32dfc827ffa736959f4fe9834ef528c.tar.gz | |
mdev: safer handling of $SUBSYSTEM in mdev -s
Diffstat (limited to 'util-linux')
| -rw-r--r-- | util-linux/mdev.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/util-linux/mdev.c b/util-linux/mdev.c index 0f7e082ba..2451cca05 100644 --- a/util-linux/mdev.c +++ b/util-linux/mdev.c @@ -1,6 +1,5 @@ /* vi: set sw=4 ts=4: */ /* - * * mdev - Mini udev for busybox * * Copyright 2005 Rob Landley <rob@landley.net> @@ -8,7 +7,6 @@ * * Licensed under GPL version 2, see file LICENSE in this tarball for details. */ - #include "libbb.h" #include "xregex.h" @@ -353,11 +351,13 @@ static int FAST_FUNC dirAction(const char *fileName UNUSED_PARAM, void *userData UNUSED_PARAM, int depth) { - /* Extract device subsystem -- the name of the directory under /sys/class/ */ + /* Extract device subsystem -- the name of the directory + * under /sys/class/ */ if (1 == depth) { + free(subsystem); subsystem = strrchr(fileName, '/'); if (subsystem) - subsystem++; + subsystem = xstrdup(subsystem + 1); } return (depth >= MAX_SYSFS_DEPTH ? SKIP : TRUE); @@ -397,17 +397,17 @@ static void load_firmware(const char *const firmware, const char *const sysfs_pa goto out; loading: - /* tell kernel we're loading by `echo 1 > /sys/$DEVPATH/loading` */ + /* tell kernel we're loading by "echo 1 > /sys/$DEVPATH/loading" */ if (full_write(loading_fd, "1", 1) != 1) goto out; - /* load firmware by `cat /lib/firmware/$FIRMWARE > /sys/$DEVPATH/data */ + /* load firmware into /sys/$DEVPATH/data */ data_fd = open("data", O_WRONLY); if (data_fd == -1) goto out; cnt = bb_copyfd_eof(firmware_fd, data_fd); - /* tell kernel result by `echo [0|-1] > /sys/$DEVPATH/loading` */ + /* tell kernel result by "echo [0|-1] > /sys/$DEVPATH/loading" */ if (cnt > 0) full_write(loading_fd, "0", 1); else |