firmware_loader: load files from the mount namespace of init
Subsystems (5)
PATCH RESEND v3 1/1 firmware_loader: load files from the mount namespace of init
I have an experimental setup where almost every possible system service (even early startup ones) runs in separate namespace, using a dedicated, minimal file system. In process of minimizing the contents of the file systems with regards to modules and firmware files, I noticed that in my system, the firmware files are loaded from three different mount namespaces, those of systemd-udevd, init and systemd-networkd. The logic of the source namespace is not very clear, it seems to depend on the driver, but the namespace of the current process is used.
So, this patch tries to make things a bit clearer and changes the loading of firmware files only from the mount namespace of init. This may also improve security, though I think that using firmware files as attack vector could be too impractical anyway.
Later, it might make sense to make the mount namespace configurable, for example with a new file in /proc/sys/kernel/firmware_config/. That would allow a dedicated file system only for firmware files and those need not be present anywhere else. This configurability would make more sense if made also for kernel modules and /sbin/modprobe. Modules are already loaded from init namespace (usermodehelper uses kthreadd namespace) except when directly loaded by systemd-udevd.
Instead of using the mount namespace of the current process to load firmware files, use the mount namespace of init process.
Link:
https://lore.kernel.org/lkml/[email protected]/
---
Changelog:v1->v2: added selfestsv2->v3: added comments, don't assume writable /lib/firmware
--- drivers/base/firmware_loader/main.c | 6 +- fs/exec.c | 26 +++ include/linux/fs.h | 2 + tools/testing/selftests/firmware/Makefile | 9 +- .../testing/selftests/firmware/fw_namespace.c | 151 ++++++++++++++++++ .../selftests/firmware/fw_run_tests.sh | 4 + 6 files changed, 190 insertions(+), 8 deletions(-) create mode 100644 tools/testing/selftests/firmware/fw_namespace.c
drivers/base/firmware_loader/main.c +4 -2
@@ -493,8 +493,10 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, } fw_priv->size =0 ; - rc =kernel_read_file_from_path (path, &buffer, &size, - msize, id); + +/* load firmware files from the mount namespace of init */ + rc =kernel_read_file_from_path_initns (path, &buffer, + &size, msize, id);if (rc) {if (rc != -ENOENT ) dev_warn(device, "loading %s failed with error %d\n",
fs/exec.c +26 -0
@@ -981,6 +981,32 @@ int kernel_read_file_from_path(const char *path, void **buf, loff_t *size, }EXPORT_SYMBOL_GPL (kernel_read_file_from_path); +int kernel_read_file_from_path_initns (const char *path,void **buf, +loff_t *size,loff_t max_size, +enum kernel_read_file_id id) +{ +struct file *file; +struct path root; +int ret; + +if (!path || !*path) +return -EINVAL ; + +task_lock (&init_task); +get_fs_root (init_task.fs, &root); +task_unlock (&init_task); + + file =file_open_root (root.dentry, root.mnt, path,O_RDONLY ,0 ); +path_put (&root); +if (IS_ERR (file)) +return PTR_ERR (file); + + ret =kernel_read_file (file, buf, size, max_size, id); +fput (file); +return ret; +} +EXPORT_SYMBOL_GPL (kernel_read_file_from_path_initns); +int kernel_read_file_from_fd (int fd,void **buf,loff_t *size,loff_t max_size,enum kernel_read_file_id id) {
include/linux/fs.h +2 -0
@@ -2994,6 +2994,8 @@ extern int kernel_read_file(struct file *, void **, loff_t *, loff_t, enum kernel_read_file_id);extern int kernel_read_file_from_path (const char *,void **,loff_t *,loff_t ,enum kernel_read_file_id ); +extern int kernel_read_file_from_path_initns (const char *,void **,loff_t *,loff_t , +enum kernel_read_file_id );extern int kernel_read_file_from_fd (int ,void **,loff_t *,loff_t ,enum kernel_read_file_id );extern ssize_t kernel_read (struct file *,void *,size_t ,loff_t *);
tools/testing/selftests/firmware/Makefile +3 -6
@@ -1,13 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-only # Makefile for firmware loading selftests - -# No binaries, but make sure arg-less "make" doesn't trigger "run_tests" -all: +CFLAGS = -Wall \ + -O2 TEST_PROGS := fw_run_tests.sh TEST_FILES := fw_fallback.sh fw_filesystem.sh fw_lib.sh +TEST_GEN_FILES := fw_namespace include ../lib.mk - -# Nothing to clean up. -clean:
tools/testing/selftests/firmware/fw_namespace.c new file +151 -0
151 lines not on this page · raw message
tools/testing/selftests/firmware/fw_run_tests.sh +4 -0
@@ -61,6 +61,10 @@ run_test_config_0003() check_mods check_setup +echo "Running namespace test: " +$TEST_DIR/fw_namespace $DIR/trigger_request +echo "OK" + if [ -f $FW_FORCE_SYSFS_FALLBACK ]; then run_test_config_0001 run_test_config_0002
Signature · 1 line
2.24.1