Commit 901cff7c authored by Topi Miettinen's avatar Topi Miettinen Committed by Greg Kroah-Hartman
Browse files

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/bb46ebae-4746-90d9-ec5b-fce4c9328c86@gmail.com/
Link: https://lore.kernel.org/lkml/0e3f7653-c59d-9341-9db2-c88f5b988c68@gmail.com/


Signed-off-by: default avatarTopi Miettinen <toiwoton@gmail.com>
Link: https://lore.kernel.org/r/20200123125839.37168-1-toiwoton@gmail.com


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 469e1906

drivers/base/firmware_loader/main.c

+4 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -985,6 +985,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
Original line number Diff line number Diff line
@@ -3012,6 +3012,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
Original line number Diff line number Diff line 
# 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

0 → 100644
+151 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/* Test triggering of loading of firmware from different mount

 * namespaces. Expect firmware to be always loaded from the mount

 * namespace of PID 1. */

#define _GNU_SOURCE

#include <errno.h>

#include <fcntl.h>

#include <sched.h>

#include <stdarg.h>

#include <stdbool.h>

#include <stdio.h>

#include <stdlib.h>

#include <string.h>

#include <sys/mount.h>

#include <sys/stat.h>

#include <sys/types.h>

#include <sys/wait.h>

#include <unistd.h>



#ifndef CLONE_NEWNS

# define CLONE_NEWNS 0x00020000

#endif



static char *fw_path = NULL;



static void die(char *fmt, ...)

{

	va_list ap;



	va_start(ap, fmt);

	vfprintf(stderr, fmt, ap);

	va_end(ap);

	if (fw_path)

		unlink(fw_path);

	umount("/lib/firmware");

	exit(EXIT_FAILURE);

}



static void trigger_fw(const char *fw_name, const char *sys_path)

{

	int fd;



	fd = open(sys_path, O_WRONLY);

	if (fd < 0)

		die("open failed: %s\n",

		    strerror(errno));

	if (write(fd, fw_name, strlen(fw_name)) != strlen(fw_name))

		exit(EXIT_FAILURE);

	close(fd);

}



static void setup_fw(const char *fw_path)

{

	int fd;

	const char fw[] = "ABCD0123";



	fd = open(fw_path, O_WRONLY | O_CREAT, 0600);

	if (fd < 0)

		die("open failed: %s\n",

		    strerror(errno));

	if (write(fd, fw, sizeof(fw) -1) != sizeof(fw) -1)

		die("write failed: %s\n",

		    strerror(errno));

	close(fd);

}



static bool test_fw_in_ns(const char *fw_name, const char *sys_path, bool block_fw_in_parent_ns)

{

	pid_t child;



	if (block_fw_in_parent_ns)

		if (mount("test", "/lib/firmware", "tmpfs", MS_RDONLY, NULL) == -1)

			die("blocking firmware in parent ns failed\n");



	child = fork();

	if (child == -1) {

		die("fork failed: %s\n",

			strerror(errno));

	}

	if (child != 0) { /* parent */

		pid_t pid;

		int status;



		pid = waitpid(child, &status, 0);

		if (pid == -1) {

			die("waitpid failed: %s\n",

				strerror(errno));

		}

		if (pid != child) {

			die("waited for %d got %d\n",

				child, pid);

		}

		if (!WIFEXITED(status)) {

			die("child did not terminate cleanly\n");

		}

		if (block_fw_in_parent_ns)

			umount("/lib/firmware");

		return WEXITSTATUS(status) == EXIT_SUCCESS ? true : false;

	}



	if (unshare(CLONE_NEWNS) != 0) {

		die("unshare(CLONE_NEWNS) failed: %s\n",

			strerror(errno));

	}

	if (mount(NULL, "/", NULL, MS_SLAVE|MS_REC, NULL) == -1)

		die("remount root in child ns failed\n");



	if (!block_fw_in_parent_ns) {

		if (mount("test", "/lib/firmware", "tmpfs", MS_RDONLY, NULL) == -1)

			die("blocking firmware in child ns failed\n");

	} else

		umount("/lib/firmware");



	trigger_fw(fw_name, sys_path);



	exit(EXIT_SUCCESS);

}



int main(int argc, char **argv)

{

	const char *fw_name = "test-firmware.bin";

	char *sys_path;

	if (argc != 2)

		die("usage: %s sys_path\n", argv[0]);



	/* Mount tmpfs to /lib/firmware so we don't have to assume

	   that it is writable for us.*/

	if (mount("test", "/lib/firmware", "tmpfs", 0, NULL) == -1)

		die("mounting tmpfs to /lib/firmware failed\n");



	sys_path = argv[1];

	asprintf(&fw_path, "/lib/firmware/%s", fw_name);



	setup_fw(fw_path);



	setvbuf(stdout, NULL, _IONBF, 0);

	/* Positive case: firmware in PID1 mount namespace */

	printf("Testing with firmware in parent namespace (assumed to be same file system as PID1)\n");

	if (!test_fw_in_ns(fw_name, sys_path, false))

		die("error: failed to access firmware\n");



	/* Negative case: firmware in child mount namespace, expected to fail */

	printf("Testing with firmware in child namespace\n");

	if (test_fw_in_ns(fw_name, sys_path, true))

		die("error: firmware access did not fail\n");



	unlink(fw_path);

	free(fw_path);

	umount("/lib/firmware");

	exit(EXIT_SUCCESS);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE