Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security

Pull security layer updates from James Morris:
 "There are a bunch of fixes to the TPM, IMA, and Keys code, with minor
  fixes scattered across the subsystem.

  IMA now requires signed policy, and that policy is also now measured
  and appraised"

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security: (67 commits)
  X.509: Make algo identifiers text instead of enum
  akcipher: Move the RSA DER encoding check to the crypto layer
  crypto: Add hash param to pkcs1pad
  sign-file: fix build with CMS support disabled
  MAINTAINERS: update tpmdd urls
  MODSIGN: linux/string.h should be #included to get memcpy()
  certs: Fix misaligned data in extra certificate list
  X.509: Handle midnight alternative notation in GeneralizedTime
  X.509: Support leap seconds
  Handle ISO 8601 leap seconds and encodings of midnight in mktime64()
  X.509: Fix leap year handling again
  PKCS#7: fix unitialized boolean 'want'
  firmware: change kernel read fail to dev_dbg()
  KEYS: Use the symbol value for list size, updated by scripts/insert-sys-cert
  KEYS: Reserve an extra certificate symbol for inserting without recompiling
  modsign: hide openssl output in silent builds
  tpm_tis: fix build warning with tpm_tis_resume
  ima: require signed IMA policy
  ima: measure and appraise the IMA policy itself
  ima: load policy using path
  ...

1 files changed, 9 insertions, 64 deletions

diff --git a/kernel/kexec_file.c b/kernel/kexec_file.c
index 56b18eb1f001..c72d2ff5896e 100644
--- a/kernel/kexec_file.c
+++ b/kernel/kexec_file.c
@@ -18,6 +18,7 @@
 #include <linux/kexec.h>
 #include <linux/mutex.h>
 #include <linux/list.h>
+#include <linux/fs.h>
 #include <crypto/hash.h>
 #include <crypto/sha.h>
 #include <linux/syscalls.h>
@@ -33,65 +34,6 @@ size_t __weak kexec_purgatory_size = 0;
 
 static int kexec_calculate_store_digests(struct kimage *image);
 
-static int copy_file_from_fd(int fd, void **buf, unsigned long *buf_len)
-{
-        struct fd f = fdget(fd);
-        int ret;
-        struct kstat stat;
-        loff_t pos;
-        ssize_t bytes = 0;
-
-        if (!f.file)
-                return -EBADF;
-
-        ret = vfs_getattr(&f.file->f_path, &stat);
-        if (ret)
-                goto out;
-
-        if (stat.size > INT_MAX) {
-                ret = -EFBIG;
-                goto out;
-        }
-
-        /* Don't hand 0 to vmalloc, it whines. */
-        if (stat.size == 0) {
-                ret = -EINVAL;
-                goto out;
-        }
-
-        *buf = vmalloc(stat.size);
-        if (!*buf) {
-                ret = -ENOMEM;
-                goto out;
-        }
-
-        pos = 0;
-        while (pos < stat.size) {
-                bytes = kernel_read(f.file, pos, (char *)(*buf) + pos,
-                                    stat.size - pos);
-                if (bytes < 0) {
-                        vfree(*buf);
-                        ret = bytes;
-                        goto out;
-                }
-
-                if (bytes == 0)
-                        break;
-                pos += bytes;
-        }
-
-        if (pos != stat.size) {
-                ret = -EBADF;
-                vfree(*buf);
-                goto out;
-        }
-
-        *buf_len = pos;
-out:
-        fdput(f);
-        return ret;
-}
-
 /* Architectures can provide this probe function */
 int __weak arch_kexec_kernel_image_probe(struct kimage *image, void *buf,
                                          unsigned long buf_len)
@@ -182,16 +124,17 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
 {
         int ret = 0;
         void *ldata;
+        loff_t size;
 
-        ret = copy_file_from_fd(kernel_fd, &image->kernel_buf,
-                                &image->kernel_buf_len);
+        ret = kernel_read_file_from_fd(kernel_fd, &image->kernel_buf,
+                                       &size, INT_MAX, READING_KEXEC_IMAGE);
         if (ret)
                 return ret;
+        image->kernel_buf_len = size;
 
         /* Call arch image probe handlers */
         ret = arch_kexec_kernel_image_probe(image, image->kernel_buf,
                                             image->kernel_buf_len);
-
         if (ret)
                 goto out;
 
@@ -206,10 +149,12 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
 #endif
         /* It is possible that there no initramfs is being loaded */
         if (!(flags & KEXEC_FILE_NO_INITRAMFS)) {
-                ret = copy_file_from_fd(initrd_fd, &image->initrd_buf,
-                                        &image->initrd_buf_len);
+                ret = kernel_read_file_from_fd(initrd_fd, &image->initrd_buf,
+                                               &size, INT_MAX,
+                                               READING_KEXEC_INITRAMFS);
                 if (ret)
                         goto out;
+                image->initrd_buf_len = size;
         }
 
         if (cmdline_len) {