Merge branch 'for-4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[linux-2.6-block.git] / fs / exec.c

diff --git a/fs/exec.c b/fs/exec.c
index 1ebf6e5a521d9924aa6572bedba504efaf32ee9b..fc281b738a9822a652f7d19bb60ae15acd7a7ebf 100644 (file)
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -908,14 +908,14 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size,
                goto out;
 
        i_size = i_size_read(file_inode(file));
-       if (max_size > 0 && i_size > max_size) {
-               ret = -EFBIG;
-               goto out;
-       }
        if (i_size <= 0) {
                ret = -EINVAL;
                goto out;
        }
+       if (i_size > SIZE_MAX || (max_size > 0 && i_size > max_size)) {
+               ret = -EFBIG;
+               goto out;
+       }
 
        if (id != READING_FIRMWARE_PREALLOC_BUFFER)
                *buf = vmalloc(i_size);