diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-10-11 11:32:17 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-10-30 10:39:21 +0000 |
| commit | d142df03a798ee7d2db10a1f20945110ea6067ff (patch) | |
| tree | 2bdfa599c3de25faf1ed7507b48c20bae66ce20f /drivers/firmware/efivars.c | |
| parent | bd52276fa1d420c3a504b76ffaaa1642cc79d4c4 (diff) | |
| download | linux-d142df03a798ee7d2db10a1f20945110ea6067ff.tar.gz linux-d142df03a798ee7d2db10a1f20945110ea6067ff.tar.bz2 linux-d142df03a798ee7d2db10a1f20945110ea6067ff.zip | |
efivarfs: efivarfs_file_read ensure we free data in error paths
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Acked-by: Matthew Garrett <mjg@redhat.com>
Acked-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'drivers/firmware/efivars.c')
| -rw-r--r-- | drivers/firmware/efivars.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index 6793965b7c8b..b7c9a3261dc4 100644 --- a/drivers/firmware/efivars.c +++ b/drivers/firmware/efivars.c @@ -766,7 +766,7 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf, unsigned long datasize = 0; u32 attributes; void *data; - ssize_t size; + ssize_t size = 0; status = efivars->ops->get_variable(var->var.VariableName, &var->var.VendorGuid, @@ -784,13 +784,13 @@ static ssize_t efivarfs_file_read(struct file *file, char __user *userbuf, &var->var.VendorGuid, &attributes, &datasize, (data + 4)); - if (status != EFI_SUCCESS) - return 0; + goto out_free; memcpy(data, &attributes, 4); size = simple_read_from_buffer(userbuf, count, ppos, data, datasize + 4); +out_free: kfree(data); return size; |