fs/kernel_read_file: Add file_size output argument

[platform/kernel/linux-starfive.git] / fs / kernel_read_file.c

diff --git a/fs/kernel_read_file.c b/fs/kernel_read_file.c
index e21a760..2e29c38 100644 (file)
--- a/fs/kernel_read_file.c
+++ b/fs/kernel_read_file.c
@@ -14,6 +14,8 @@
  *             @buf_size will be ignored)
  * @buf_size   size of buf, if already allocated. If @buf not
  *             allocated, this is the largest size to allocate.
+ * @file_size  if non-NULL, the full size of @file will be
+ *             written here.
  * @id         the kernel_read_file_id identifying the type of
  *             file contents being read (for LSMs to examine)
  *
@@ -22,7 +24,8 @@
  *
  */
 int kernel_read_file(struct file *file, void **buf,
-                    size_t buf_size, enum kernel_read_file_id id)
+                    size_t buf_size, size_t *file_size,
+                    enum kernel_read_file_id id)
 {
        loff_t i_size, pos;
        ssize_t bytes = 0;
@@ -49,6 +52,8 @@ int kernel_read_file(struct file *file, void **buf,
                ret = -EFBIG;
                goto out;
        }
+       if (file_size)
+               *file_size = i_size;
 
        if (!*buf)
                *buf = allocated = vmalloc(i_size);
@@ -91,7 +96,8 @@ out:
 EXPORT_SYMBOL_GPL(kernel_read_file);
 
 int kernel_read_file_from_path(const char *path, void **buf,
-                              size_t buf_size, enum kernel_read_file_id id)
+                              size_t buf_size, size_t *file_size,
+                              enum kernel_read_file_id id)
 {
        struct file *file;
        int ret;
@@ -103,14 +109,14 @@ int kernel_read_file_from_path(const char *path, void **buf,
        if (IS_ERR(file))
                return PTR_ERR(file);
 
-       ret = kernel_read_file(file, buf, buf_size, id);
+       ret = kernel_read_file(file, buf, buf_size, file_size, id);
        fput(file);
        return ret;
 }
 EXPORT_SYMBOL_GPL(kernel_read_file_from_path);
 
 int kernel_read_file_from_path_initns(const char *path, void **buf,
-                                     size_t buf_size,
+                                     size_t buf_size, size_t *file_size,
                                      enum kernel_read_file_id id)
 {
        struct file *file;
@@ -129,13 +135,14 @@ int kernel_read_file_from_path_initns(const char *path, void **buf,
        if (IS_ERR(file))
                return PTR_ERR(file);
 
-       ret = kernel_read_file(file, buf, buf_size, id);
+       ret = kernel_read_file(file, buf, buf_size, file_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, size_t buf_size,
+                            size_t *file_size,
                             enum kernel_read_file_id id)
 {
        struct fd f = fdget(fd);
@@ -144,7 +151,7 @@ int kernel_read_file_from_fd(int fd, void **buf, size_t buf_size,
        if (!f.file)
                goto out;
 
-       ret = kernel_read_file(f.file, buf, buf_size, id);
+       ret = kernel_read_file(f.file, buf, buf_size, file_size, id);
 out:
        fdput(f);
        return ret;