Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-15 13:15:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

efivarfs: Use query_variable_info() to limit kmalloc()

Browse Source 
We don't want someone who can write EFI variables to be able to
allocate arbitrarily large amounts of memory, so cap it to something
sensible like the amount of free space for EFI variables.

Acked-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Cc: Matthew Garrett <mjg@redhat.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
This commit is contained in:
Matt Fleming 2012-11-09 21:02:56 +00:00
parent cfcf2f1170
commit 89d16665d3
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
drivers/firmware/efivars.c
View File

@ -694,28 +694,51 @@ static ssize_t efivarfs_file_write(struct file *file,
struct inode *inode = file->f_mapping->host; struct inode *inode = file->f_mapping->host;
unsigned long datasize = count - sizeof(attributes); unsigned long datasize = count - sizeof(attributes);
unsigned long newdatasize; unsigned long newdatasize;
u64 storage_size, remaining_size, max_size;
ssize_t bytes = 0; ssize_t bytes = 0;
if (count < sizeof(attributes)) if (count < sizeof(attributes))
return -EINVAL; return -EINVAL;
data = kmalloc(datasize, GFP_KERNEL); if (copy_from_user(&attributes, userbuf, sizeof(attributes)))
return -EFAULT;
if (!data) if (attributes & ~(EFI_VARIABLE_MASK))
return -ENOMEM; return -EINVAL;
efivars = var->efivars; efivars = var->efivars;
if (copy_from_user(&attributes, userbuf, sizeof(attributes))) { /*
bytes = -EFAULT; * Ensure that the user can't allocate arbitrarily large
goto out; * amounts of memory. Pick a default size of 64K if
* QueryVariableInfo() isn't supported by the firmware.
*/
spin_lock(&efivars->lock);
if (!efivars->ops->query_variable_info)
status = EFI_UNSUPPORTED;
else {
const struct efivar_operations *fops = efivars->ops;
status = fops->query_variable_info(attributes, &storage_size,
&remaining_size, &max_size);
} }
if (attributes & ~(EFI_VARIABLE_MASK)) { spin_unlock(&efivars->lock);
bytes = -EINVAL;
goto out; if (status != EFI_SUCCESS) {
if (status != EFI_UNSUPPORTED)
return efi_status_to_err(status);
remaining_size = 65536;
} }
if (datasize > remaining_size)
return -ENOSPC;
data = kmalloc(datasize, GFP_KERNEL);
if (!data)
return -ENOMEM;
if (copy_from_user(data, userbuf + sizeof(attributes), datasize)) { if (copy_from_user(data, userbuf + sizeof(attributes), datasize)) {
bytes = -EFAULT; bytes = -EFAULT;
goto out; goto out;
@ -1709,6 +1732,8 @@ efivars_init(void)
ops.get_variable = efi.get_variable; ops.get_variable = efi.get_variable;
ops.set_variable = efi.set_variable; ops.set_variable = efi.set_variable;
ops.get_next_variable = efi.get_next_variable; ops.get_next_variable = efi.get_next_variable;
ops.query_variable_info = efi.query_variable_info;
error = register_efivars(&__efivars, &ops, efi_kobj); error = register_efivars(&__efivars, &ops, efi_kobj);
if (error) if (error)
goto err_put; goto err_put;

1
include/linux/efi.h
View File

@ -646,6 +646,7 @@ struct efivar_operations {
efi_get_variable_t *get_variable; efi_get_variable_t *get_variable;
efi_get_next_variable_t *get_next_variable; efi_get_next_variable_t *get_next_variable;
efi_set_variable_t *set_variable; efi_set_variable_t *set_variable;
efi_query_variable_info_t *query_variable_info;
}; };
struct efivars { struct efivars {