fs/kernel_read_file: Remove FIRMWARE_PREALLOC_BUFFER enum

commit c307459b9d1fcb8bbf3ea5a4162979532322ef77 upstream.

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: a098ecd2fa7d ("firmware: support loading into a pre-allocated buffer")
Fixes: fd90bc559bfb ("ima: based on policy verify firmware signatures (pre-allocated buffer)")
Fixes: 4f0496d8ffa3 ("ima: based on policy warn about loading firmware (pre-allocated buffer)")
Signed-off-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Mimi Zohar <zohar@linux.ibm.com>
Reviewed-by: Luis Chamberlain <mcgrof@kernel.org>
Acked-by: Scott 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/firmware_loader/main.c b/drivers/base/firmware_loader/main.c
index 63b9714a0154855c9eacd1f3e3e5982a2a179e64..b0ec2721f55ded62892791d53f7dadbfc8fb4dd6 100644 (file)
--- a/drivers/base/firmware_loader/main.c
+++ b/drivers/base/firmware_loader/main.c
@@ -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",

diff --git a/fs/exec.c b/fs/exec.c
index 3622681489864396a9dbc800451396f993307d4f..529c3bcefb650dd4d7e8411eaf418be4e76eb2d1 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -955,6 +955,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)
@@ -978,8 +979,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;
@@ -1008,7 +1009,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;
                }

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 7d4d04c9d3e647041a9cdd7935a32df2ff44ac47..dbbeb52ce5f3117bcc2807af645407d9b41fa47d 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2861,7 +2861,6 @@ extern int do_pipe_flags(int *, int);
 #define __kernel_read_file_id(id) \
        id(UNKNOWN, unknown)            \
        id(FIRMWARE, firmware)          \
-       id(FIRMWARE_PREALLOC_BUFFER, firmware)  \
        id(MODULE, kernel-module)               \
        id(KEXEC_IMAGE, kexec-image)            \
        id(KEXEC_INITRAMFS, kexec-initramfs)    \

diff --git a/kernel/module.c b/kernel/module.c
index 8486123ffd7af335ba7a95ae6ced0d178944af8f..cc9281398f698daecc21468dead69f53f90e5a5f 100644 (file)
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -4028,7 +4028,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();

diff --git a/security/integrity/digsig.c b/security/integrity/digsig.c
index e9cbadade74bda5e046457895212a71b1e97c78b..ac02b7632353e4f17865c8ac2363e3f4d1874370 100644 (file)
--- a/security/integrity/digsig.c
+++ b/security/integrity/digsig.c
@@ -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;

diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index e3fcad871861a31918e213e7dc01bdb24eeae10e..15a44c5022f77f2272cc61b8e30c2113d2b5e26b 100644 (file)
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -272,7 +272,7 @@ static const struct file_operations ima_ascii_measurements_ops = {
 
 static ssize_t ima_read_policy(char *path)
 {
-       void *data;
+       void *data = NULL;
        char *datap;
        loff_t size;
        int rc, pathlen = strlen(path);

diff --git a/security/integrity/ima/ima_main.c b/security/integrity/ima/ima_main.c
index 4c86cd4eece0cce972497c83200ace7abb11161b..e22caa833b7d9dae1111f6f9d9c51485a887b05c 100644 (file)
--- a/security/integrity/ima/ima_main.c
+++ b/security/integrity/ima/ima_main.c
@@ -621,19 +621,17 @@ void ima_post_path_mknod(struct dentry *dentry)
 int ima_read_file(struct file *file, enum kernel_read_file_id read_id)
 {
        /*
-        * READING_FIRMWARE_PREALLOC_BUFFER
-        *
         * Do devices using pre-allocated memory run the risk of the
         * firmware being accessible to the device prior to the completion
         * of IMA's signature verification any more than when using two
-        * buffers?
+        * buffers? It may be desirable to include the buffer address
+        * in this API and walk all the dma_map_single() mappings to check.
         */
        return 0;
 }
 
 const int read_idmap[READING_MAX_ID] = {
        [READING_FIRMWARE] = FIRMWARE_CHECK,
-       [READING_FIRMWARE_PREALLOC_BUFFER] = FIRMWARE_CHECK,
        [READING_MODULE] = MODULE_CHECK,
        [READING_KEXEC_IMAGE] = KEXEC_KERNEL_CHECK,
        [READING_KEXEC_INITRAMFS] = KEXEC_INITRAMFS_CHECK,