firmware_loader: load files from the mount namespace of init
Subsystems (5)
PATCH v2 1/1 firmware_loader: load files from the mount namespace of init
From 0b88ff99acccaefbe9b86b6a1ceebf5b075f388f Mon Sep 17 00:00:00 2001
From: Topi Miettinen <[email protected]>
Date: Fri, 17 Jan 2020 19:56:45 +0200
Subject: [PATCH] firmware_loader: load files from the mount namespace of init
Instead of using the mount namespace of the current process to load firmware files, use the mount namespace of init process.
--- 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 | 138 ++++++++++++++++++ .../selftests/firmware/fw_run_tests.sh | 4 + 6 files changed, 177 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 +138 -0
138 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
Greg Kroah-Hartman
maintainerQuoted 9 lines · Topi Miettinen
Quoted 1 line
From
0b88ff99acccaefbe9b86b6a1ceebf5b075f388fMon Sep 17 00:00:00 2001From: Topi Miettinen <[email protected]>
Date: Fri, 17 Jan 2020 19:56:45 +0200
Subject: [PATCH]firmware_loader: load files from the mount namespace of initInstead of using the mount namespace of the current process to load firmware files, use the mount namespace of init process.
Signed-off-by Topi Miettinen <[email protected]>
What changed from v1?
Also, you had a great description for your first patch, put all that in here too.
And finally, no need to include the header of it, use 'git send-email' to send it directly.
thanks,
greg k-h