mirror of
https://github.com/torvalds/linux
synced 2024-09-06 18:01:05 +00:00
fs/kernel_read_file: Remove redundant size argument
In preparation for refactoring kernel_read_file*(), remove the redundant "size" argument which is not needed: it can be included in the return code, with callers adjusted. (VFS reads already cannot be larger than INT_MAX.) Signed-off-by: Kees Cook <keescook@chromium.org> Reviewed-by: Mimi Zohar <zohar@linux.ibm.com> Reviewed-by: Luis Chamberlain <mcgrof@kernel.org> Reviewed-by: James Morris <jamorris@linux.microsoft.com> Acked-by: Scott Branden <scott.branden@broadcom.com> Link: https://lore.kernel.org/r/20201002173828.2099543-6-keescook@chromium.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
5287b07f6d
commit
f7a4f689bc
|
@ -467,7 +467,7 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
|
||||||
size_t in_size,
|
size_t in_size,
|
||||||
const void *in_buffer))
|
const void *in_buffer))
|
||||||
{
|
{
|
||||||
loff_t size;
|
size_t size;
|
||||||
int i, len;
|
int i, len;
|
||||||
int rc = -ENOENT;
|
int rc = -ENOENT;
|
||||||
char *path;
|
char *path;
|
||||||
|
@ -499,10 +499,9 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
|
||||||
fw_priv->size = 0;
|
fw_priv->size = 0;
|
||||||
|
|
||||||
/* load firmware files from the mount namespace of init */
|
/* load firmware files from the mount namespace of init */
|
||||||
rc = kernel_read_file_from_path_initns(path, &buffer,
|
rc = kernel_read_file_from_path_initns(path, &buffer, msize,
|
||||||
&size, msize,
|
|
||||||
READING_FIRMWARE);
|
READING_FIRMWARE);
|
||||||
if (rc) {
|
if (rc < 0) {
|
||||||
if (rc != -ENOENT)
|
if (rc != -ENOENT)
|
||||||
dev_warn(device, "loading %s failed with error %d\n",
|
dev_warn(device, "loading %s failed with error %d\n",
|
||||||
path, rc);
|
path, rc);
|
||||||
|
@ -511,6 +510,9 @@ fw_get_filesystem_firmware(struct device *device, struct fw_priv *fw_priv,
|
||||||
path);
|
path);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
size = rc;
|
||||||
|
rc = 0;
|
||||||
|
|
||||||
dev_dbg(device, "Loading firmware from %s\n", path);
|
dev_dbg(device, "Loading firmware from %s\n", path);
|
||||||
if (decompress) {
|
if (decompress) {
|
||||||
dev_dbg(device, "f/w decompressing %s\n",
|
dev_dbg(device, "f/w decompressing %s\n",
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
#include <linux/security.h>
|
#include <linux/security.h>
|
||||||
#include <linux/vmalloc.h>
|
#include <linux/vmalloc.h>
|
||||||
|
|
||||||
int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
int kernel_read_file(struct file *file, void **buf,
|
||||||
loff_t max_size, enum kernel_read_file_id id)
|
loff_t max_size, enum kernel_read_file_id id)
|
||||||
{
|
{
|
||||||
loff_t i_size, pos;
|
loff_t i_size, pos;
|
||||||
|
@ -29,7 +29,7 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
||||||
ret = -EINVAL;
|
ret = -EINVAL;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
if (i_size > SIZE_MAX || (max_size > 0 && i_size > max_size)) {
|
if (i_size > INT_MAX || (max_size > 0 && i_size > max_size)) {
|
||||||
ret = -EFBIG;
|
ret = -EFBIG;
|
||||||
goto out;
|
goto out;
|
||||||
}
|
}
|
||||||
|
@ -59,8 +59,6 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = security_kernel_post_read_file(file, *buf, i_size, id);
|
ret = security_kernel_post_read_file(file, *buf, i_size, id);
|
||||||
if (!ret)
|
|
||||||
*size = pos;
|
|
||||||
|
|
||||||
out_free:
|
out_free:
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
|
@ -72,11 +70,11 @@ int kernel_read_file(struct file *file, void **buf, loff_t *size,
|
||||||
|
|
||||||
out:
|
out:
|
||||||
allow_write_access(file);
|
allow_write_access(file);
|
||||||
return ret;
|
return ret == 0 ? pos : ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(kernel_read_file);
|
EXPORT_SYMBOL_GPL(kernel_read_file);
|
||||||
|
|
||||||
int kernel_read_file_from_path(const char *path, void **buf, loff_t *size,
|
int kernel_read_file_from_path(const char *path, void **buf,
|
||||||
loff_t max_size, enum kernel_read_file_id id)
|
loff_t max_size, enum kernel_read_file_id id)
|
||||||
{
|
{
|
||||||
struct file *file;
|
struct file *file;
|
||||||
|
@ -89,14 +87,14 @@ int kernel_read_file_from_path(const char *path, void **buf, loff_t *size,
|
||||||
if (IS_ERR(file))
|
if (IS_ERR(file))
|
||||||
return PTR_ERR(file);
|
return PTR_ERR(file);
|
||||||
|
|
||||||
ret = kernel_read_file(file, buf, size, max_size, id);
|
ret = kernel_read_file(file, buf, max_size, id);
|
||||||
fput(file);
|
fput(file);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(kernel_read_file_from_path);
|
EXPORT_SYMBOL_GPL(kernel_read_file_from_path);
|
||||||
|
|
||||||
int kernel_read_file_from_path_initns(const char *path, void **buf,
|
int kernel_read_file_from_path_initns(const char *path, void **buf,
|
||||||
loff_t *size, loff_t max_size,
|
loff_t max_size,
|
||||||
enum kernel_read_file_id id)
|
enum kernel_read_file_id id)
|
||||||
{
|
{
|
||||||
struct file *file;
|
struct file *file;
|
||||||
|
@ -115,13 +113,13 @@ int kernel_read_file_from_path_initns(const char *path, void **buf,
|
||||||
if (IS_ERR(file))
|
if (IS_ERR(file))
|
||||||
return PTR_ERR(file);
|
return PTR_ERR(file);
|
||||||
|
|
||||||
ret = kernel_read_file(file, buf, size, max_size, id);
|
ret = kernel_read_file(file, buf, max_size, id);
|
||||||
fput(file);
|
fput(file);
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(kernel_read_file_from_path_initns);
|
EXPORT_SYMBOL_GPL(kernel_read_file_from_path_initns);
|
||||||
|
|
||||||
int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size,
|
int kernel_read_file_from_fd(int fd, void **buf, loff_t max_size,
|
||||||
enum kernel_read_file_id id)
|
enum kernel_read_file_id id)
|
||||||
{
|
{
|
||||||
struct fd f = fdget(fd);
|
struct fd f = fdget(fd);
|
||||||
|
@ -130,7 +128,7 @@ int kernel_read_file_from_fd(int fd, void **buf, loff_t *size, loff_t max_size,
|
||||||
if (!f.file)
|
if (!f.file)
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
ret = kernel_read_file(f.file, buf, size, max_size, id);
|
ret = kernel_read_file(f.file, buf, max_size, id);
|
||||||
out:
|
out:
|
||||||
fdput(f);
|
fdput(f);
|
||||||
return ret;
|
return ret;
|
||||||
|
|
|
@ -36,16 +36,16 @@ static inline const char *kernel_read_file_id_str(enum kernel_read_file_id id)
|
||||||
}
|
}
|
||||||
|
|
||||||
int kernel_read_file(struct file *file,
|
int kernel_read_file(struct file *file,
|
||||||
void **buf, loff_t *size, loff_t max_size,
|
void **buf, loff_t max_size,
|
||||||
enum kernel_read_file_id id);
|
enum kernel_read_file_id id);
|
||||||
int kernel_read_file_from_path(const char *path,
|
int kernel_read_file_from_path(const char *path,
|
||||||
void **buf, loff_t *size, loff_t max_size,
|
void **buf, loff_t max_size,
|
||||||
enum kernel_read_file_id id);
|
enum kernel_read_file_id id);
|
||||||
int kernel_read_file_from_path_initns(const char *path,
|
int kernel_read_file_from_path_initns(const char *path,
|
||||||
void **buf, loff_t *size, loff_t max_size,
|
void **buf, loff_t max_size,
|
||||||
enum kernel_read_file_id id);
|
enum kernel_read_file_id id);
|
||||||
int kernel_read_file_from_fd(int fd,
|
int kernel_read_file_from_fd(int fd,
|
||||||
void **buf, loff_t *size, loff_t max_size,
|
void **buf, loff_t max_size,
|
||||||
enum kernel_read_file_id id);
|
enum kernel_read_file_id id);
|
||||||
|
|
||||||
#endif /* _LINUX_KERNEL_READ_FILE_H */
|
#endif /* _LINUX_KERNEL_READ_FILE_H */
|
||||||
|
|
|
@ -220,13 +220,12 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
|
||||||
{
|
{
|
||||||
int ret;
|
int ret;
|
||||||
void *ldata;
|
void *ldata;
|
||||||
loff_t size;
|
|
||||||
|
|
||||||
ret = kernel_read_file_from_fd(kernel_fd, &image->kernel_buf,
|
ret = kernel_read_file_from_fd(kernel_fd, &image->kernel_buf,
|
||||||
&size, INT_MAX, READING_KEXEC_IMAGE);
|
INT_MAX, READING_KEXEC_IMAGE);
|
||||||
if (ret)
|
if (ret < 0)
|
||||||
return ret;
|
return ret;
|
||||||
image->kernel_buf_len = size;
|
image->kernel_buf_len = ret;
|
||||||
|
|
||||||
/* Call arch image probe handlers */
|
/* Call arch image probe handlers */
|
||||||
ret = arch_kexec_kernel_image_probe(image, image->kernel_buf,
|
ret = arch_kexec_kernel_image_probe(image, image->kernel_buf,
|
||||||
|
@ -243,11 +242,12 @@ kimage_file_prepare_segments(struct kimage *image, int kernel_fd, int initrd_fd,
|
||||||
/* It is possible that there no initramfs is being loaded */
|
/* It is possible that there no initramfs is being loaded */
|
||||||
if (!(flags & KEXEC_FILE_NO_INITRAMFS)) {
|
if (!(flags & KEXEC_FILE_NO_INITRAMFS)) {
|
||||||
ret = kernel_read_file_from_fd(initrd_fd, &image->initrd_buf,
|
ret = kernel_read_file_from_fd(initrd_fd, &image->initrd_buf,
|
||||||
&size, INT_MAX,
|
INT_MAX,
|
||||||
READING_KEXEC_INITRAMFS);
|
READING_KEXEC_INITRAMFS);
|
||||||
if (ret)
|
if (ret < 0)
|
||||||
goto out;
|
goto out;
|
||||||
image->initrd_buf_len = size;
|
image->initrd_buf_len = ret;
|
||||||
|
ret = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (cmdline_len) {
|
if (cmdline_len) {
|
||||||
|
|
|
@ -4035,7 +4035,6 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
|
||||||
SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
|
SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
|
||||||
{
|
{
|
||||||
struct load_info info = { };
|
struct load_info info = { };
|
||||||
loff_t size;
|
|
||||||
void *hdr = NULL;
|
void *hdr = NULL;
|
||||||
int err;
|
int err;
|
||||||
|
|
||||||
|
@ -4049,12 +4048,12 @@ SYSCALL_DEFINE3(finit_module, int, fd, const char __user *, uargs, int, flags)
|
||||||
|MODULE_INIT_IGNORE_VERMAGIC))
|
|MODULE_INIT_IGNORE_VERMAGIC))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
err = kernel_read_file_from_fd(fd, &hdr, &size, INT_MAX,
|
err = kernel_read_file_from_fd(fd, &hdr, INT_MAX,
|
||||||
READING_MODULE);
|
READING_MODULE);
|
||||||
if (err)
|
if (err < 0)
|
||||||
return err;
|
return err;
|
||||||
info.hdr = hdr;
|
info.hdr = hdr;
|
||||||
info.len = size;
|
info.len = err;
|
||||||
|
|
||||||
return load_module(&info, uargs, flags);
|
return load_module(&info, uargs, flags);
|
||||||
}
|
}
|
||||||
|
|
|
@ -171,16 +171,17 @@ int __init integrity_add_key(const unsigned int id, const void *data,
|
||||||
int __init integrity_load_x509(const unsigned int id, const char *path)
|
int __init integrity_load_x509(const unsigned int id, const char *path)
|
||||||
{
|
{
|
||||||
void *data = NULL;
|
void *data = NULL;
|
||||||
loff_t size;
|
size_t size;
|
||||||
int rc;
|
int rc;
|
||||||
key_perm_t perm;
|
key_perm_t perm;
|
||||||
|
|
||||||
rc = kernel_read_file_from_path(path, &data, &size, 0,
|
rc = kernel_read_file_from_path(path, &data, 0,
|
||||||
READING_X509_CERTIFICATE);
|
READING_X509_CERTIFICATE);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
pr_err("Unable to open file: %s (%d)", path, rc);
|
pr_err("Unable to open file: %s (%d)", path, rc);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
size = rc;
|
||||||
|
|
||||||
perm = (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ;
|
perm = (KEY_POS_ALL & ~KEY_POS_SETATTR) | KEY_USR_VIEW | KEY_USR_READ;
|
||||||
|
|
||||||
|
|
|
@ -275,7 +275,7 @@ static ssize_t ima_read_policy(char *path)
|
||||||
{
|
{
|
||||||
void *data = NULL;
|
void *data = NULL;
|
||||||
char *datap;
|
char *datap;
|
||||||
loff_t size;
|
size_t size;
|
||||||
int rc, pathlen = strlen(path);
|
int rc, pathlen = strlen(path);
|
||||||
|
|
||||||
char *p;
|
char *p;
|
||||||
|
@ -284,11 +284,13 @@ static ssize_t ima_read_policy(char *path)
|
||||||
datap = path;
|
datap = path;
|
||||||
strsep(&datap, "\n");
|
strsep(&datap, "\n");
|
||||||
|
|
||||||
rc = kernel_read_file_from_path(path, &data, &size, 0, READING_POLICY);
|
rc = kernel_read_file_from_path(path, &data, 0, READING_POLICY);
|
||||||
if (rc < 0) {
|
if (rc < 0) {
|
||||||
pr_err("Unable to open file: %s (%d)", path, rc);
|
pr_err("Unable to open file: %s (%d)", path, rc);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
size = rc;
|
||||||
|
rc = 0;
|
||||||
|
|
||||||
datap = data;
|
datap = data;
|
||||||
while (size > 0 && (p = strsep(&datap, "\n"))) {
|
while (size > 0 && (p = strsep(&datap, "\n"))) {
|
||||||
|
|
Loading…
Reference in a new issue