Commit-ID: d142df03a798ee7d2db10a1f20945110ea6067ff Gitweb: http://git.kernel.org/tip/d142df03a798ee7d2db10a1f20945110ea6067ff Author: Andy Whitcroft <apw@xxxxxxxxxxxxx> AuthorDate: Thu, 11 Oct 2012 11:32:17 +0100 Committer: Matt Fleming <matt.fleming@xxxxxxxxx> CommitDate: Tue, 30 Oct 2012 10:39:21 +0000 efivarfs: efivarfs_file_read ensure we free data in error paths Signed-off-by: Andy Whitcroft <apw@xxxxxxxxxxxxx> Acked-by: Matthew Garrett <mjg@xxxxxxxxxx> Acked-by: Jeremy Kerr <jeremy.kerr@xxxxxxxxxxxxx> Signed-off-by: Matt Fleming <matt.fleming@xxxxxxxxx> --- 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 6793965..b7c9a32 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; -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
|