Commit c307459b authored by Kees Cook's avatar Kees Cook Committed by Greg Kroah-Hartman
Browse files

fs/kernel_read_file: Remove FIRMWARE_PREALLOC_BUFFER enum 



FIRMWARE_PREALLOC_BUFFER is a "how", not a "what", and confuses the LSMs
that are interested in filtering between types of things. The "how"
should be an internal detail made uninteresting to the LSMs.

Fixes: a098ecd2 ("firmware: support loading into a pre-allocated buffer")
Fixes: fd90bc55 ("ima: based on policy verify firmware signatures (pre-allocated buffer)")
Fixes: 4f0496d8 ("ima: based on policy warn about loading firmware (pre-allocated buffer)")
Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarMimi Zohar <zohar@linux.ibm.com>
Reviewed-by: default avatarLuis Chamberlain <mcgrof@kernel.org>
Acked-by: default avatarScott Branden <scott.branden@broadcom.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20201002173828.2099543-2-keescook@chromium.org


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

drivers/base/firmware_loader/main.c

+2 −3
Original line number Diff line number Diff line
@@ -470,14 +470,12 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, 
	int i, len;

	int rc = -ENOENT;

	char *path;

	enum kernel_read_file_id id = READING_FIRMWARE;

	size_t msize = INT_MAX;

	void *buffer = NULL;



	/* Already populated data member means we're loading into a buffer */

	if (!decompress && fw_priv->data) {

		buffer = fw_priv->data;

		id = READING_FIRMWARE_PREALLOC_BUFFER;

		msize = fw_priv->allocated_size;

	}
@@ -501,7 +499,8 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv, 


		/* load firmware files from the mount namespace of init */

		rc = kernel_read_file_from_path_initns(path, &buffer,

						       &size, msize, id);

						       &size, msize,

						       READING_FIRMWARE);

		if (rc) {

			if (rc != -ENOENT)

				dev_warn(device, "loading %s failed with error %d\n",

fs/exec.c

+4 −3
Original line number Diff line number Diff line
@@ -954,6 +954,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, 
{

	loff_t i_size, pos;

	ssize_t bytes = 0;

	void *allocated = NULL;

	int ret;



	if (!S_ISREG(file_inode(file)->i_mode) || max_size < 0)
@@ -977,8 +978,8 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, 
		goto out;

	}



	if (id != READING_FIRMWARE_PREALLOC_BUFFER)

		*buf = vmalloc(i_size);

	if (!*buf)

		*buf = allocated = vmalloc(i_size);

	if (!*buf) {

		ret = -ENOMEM;

		goto out;
@@ -1007,7 +1008,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size, 


out_free:

	if (ret < 0) {

		if (id != READING_FIRMWARE_PREALLOC_BUFFER) {

		if (allocated) {

			vfree(*buf);

			*buf = NULL;

		}

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2858,10 +2858,10 @@ static inline void i_readcount_inc(struct inode *inode) 
#endif

extern int do_pipe_flags(int *, int);



/* This is a list of *what* is being read, not *how*. */

#define __kernel_read_file_id(id) \

	id(UNKNOWN, unknown)		\

	id(FIRMWARE, firmware)		\

	id(FIRMWARE_PREALLOC_BUFFER, firmware)	\

	id(FIRMWARE_EFI_EMBEDDED, firmware)	\

	id(MODULE, kernel-module)		\

	id(KEXEC_IMAGE, kexec-image)		\

kernel/module.c

+1 −1
Original line number Diff line number Diff line
@@ -4035,7 +4035,7 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags) 
{

	struct load_info info = { };

	loff_t size;

	void *hdr;

	void *hdr = NULL;

	int err;



	err = may_init_module();

security/integrity/digsig.c

+1 −1
Original line number Diff line number Diff line
@@ -169,7 +169,7 @@ int __init integrity_add_key(const unsigned int id, const void *data, 


int __init integrity_load_x509(const unsigned int id, const char *path)

{

	void *data;

	void *data = NULL;

	loff_t size;

	int rc;

	key_perm_t perm;

CRA Git | Maintained and supported by SUSTech CRA and CCSE