diff options
| author | Andy Whitcroft <apw@canonical.com> | 2012-10-10 15:13:37 +0100 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-11-14 18:19:43 -0700 |
| commit | a464cbcbade3b0462d08f45c26a35848b253b325 (patch) | |
| tree | f247d528e0010b57ee587d44f43f1dfa2312583e | |
| parent | cbe803554c52554560d2389548b3b26b308ccb50 (diff) | |
UBUNTU: SAUCE: efivarfs: efivarfs_file_read ensure we free data in error paths
BugLink: http://bugs.launchpad.net/bugs/1063061
Acked-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Andy Whitcroft <apw@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
| -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 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; |