From a464cbcbade3b0462d08f45c26a35848b253b325 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 10 Oct 2012 15:13:37 +0100 Subject: UBUNTU: SAUCE: efivarfs: efivarfs_file_read ensure we free data in error paths BugLink: http://bugs.launchpad.net/bugs/1063061 Acked-by: Matthew Garrett Signed-off-by: Andy Whitcroft Signed-off-by: Tim Gardner --- drivers/firmware/efivars.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c index a2e50315b52..ccd12f5bdab 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; -- cgit v1.2.3