On Mon, Jul 21, 2014 at 08:26:35AM -0700, Greg Kroah-Hartman wrote: > On Mon, Jul 21, 2014 at 08:08:16AM -0700, Kees Cook wrote: > > Perhaps it would be easier if I also sent the patch to udev's helper, > > so you could see how I propose handling the userspace change to using > > the new interface? > > As there is no more "udev firmware helper", I don't know what you would > be patching here. Firmware should always be loaded by the kernel > directly, udev isn't involved anyore at all. > > confused, > > greg k-h The kernel _can_ load directly (when the paths are configured correctly), but I'm not sure why you say udev isn't involved any more. It's been like this for years, and even the latest systemd shows the udev rule is still in place: http://cgit.freedesktop.org/systemd/systemd/tree/rules/50-firmware.rules and that the firmware loader is still in the source tree: http://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-firmware.c Here's the patch for the new interface... -Kees --- From: Kees Cook <keescook@xxxxxxxxxxxx> Date: Sun, 23 Mar 2014 07:46:07 -0700 Subject: [PATCH] firmware: use fd-based interface if available The new kernel firmware_class interface file "fd" performs the firmware loading in a single step, allowing the kernel to validate the firmware origin and contents. Signed-off-by: Kees Cook <keescook@xxxxxxxxxxxx> --- src/udev/udev-builtin-firmware.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c index 8cfeed6..893ec13 100644 --- a/src/udev/udev-builtin-firmware.c +++ b/src/udev/udev-builtin-firmware.c @@ -80,6 +80,7 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo static const char *searchpath[] = { FIRMWARE_PATH }; char loadpath[UTIL_PATH_SIZE]; char datapath[UTIL_PATH_SIZE]; + char fdpath[UTIL_PATH_SIZE]; char fwpath[UTIL_PATH_SIZE]; const char *firmware; FILE *fwfile = NULL; @@ -131,6 +132,16 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo goto exit; } + /* Use fd-based firmware loading interface. */ + strscpyl(fdpath, sizeof(fdpath), udev_device_get_syspath(dev), "/fd", NULL); + if (stat(fdpath, &statbuf) == 0) { + snprintf(datapath, sizeof(datapath), "%d", fileno(fwfile)); + /* We're done if the we gave the kernel our fw fd. */ + if (set_loading(udev, fdpath, (const char *)datapath)) + goto exit; + } + + /* Fallback to legacy blob loading. */ if (!set_loading(udev, loadpath, "1")) goto exit; -- 1.7.9.5 -- Kees Cook Chrome OS Security -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
