---

yaml --- r: 344063 b: refs/heads/master c: d142df0 h: refs/heads/master i: 344061: 828788d 344059: e6cb858 344055: fcab277 344047: b6e4bfe 344031: 9555f3a 343999: 4190543 343935: 6987f48 343807: 4a3886f 343551: ce28f3c 343039: 3256d75 342015: d27ce33 339967: a59e057 335871: 3e43c2f 327679: 9dd685f v: v3
git-mirror · Oct 30, 2012 · 542864c · 542864c
1 parent aa4101e
commit 542864c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bd52276fa1d420c3a504b76ffaaa1642cc79d4c4
+refs/heads/master: d142df03a798ee7d2db10a1f20945110ea6067ff
diff --git a/trunk/drivers/firmware/efivars.c b/trunk/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;