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>

diff --git a/drivers/firmware/efivars.c b/drivers/firmware/efivars.c
index 6793965b7c8b109cf6443829a6e5625116cd854f..b7c9a3261dc47c7ce4adcf101e541a7dbca22d0d 100644 (file)
--- 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;