Skip to contentSkip to conversation

efi, pstore: Cocci spatch "memdup.spatch"

PATCH In review Thomas Meyer 4 participants 4 messages Jun 1, 2013 – Jun 3, 2013

Subsystems (2)
EFI Pstore filesystem
lore
Share & tools
lore

Thomas Meyer

author
#0 lore raw

PATCH 1/1 efi, pstore: Cocci spatch "memdup.spatch"

Signed-off-by Thomas Meyer <[email protected]>

---

drivers/firmware/efi/efi-pstore.c +1 -2
diff -u -p a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c
@@ -79,10 +79,9 @@ static int efi_pstore_read_func(struct e
 			   &entry->var.DataSize, entry->var.Data);
 	size = entry->var.DataSize;
 
-	*cb_data->buf = kmalloc(size, GFP_KERNEL);
+	*cb_data->buf = kmemdup(entry->var.Data, size, GFP_KERNEL);
 	if (*cb_data->buf == NULL)
 		return -ENOMEM;
-	memcpy(*cb_data->buf, entry->var.Data, size);
 	return size;
 }
Acked-by on v1 1/1
#1 lore raw
Quoted 2 lines · Thomas Meyer
Signed-off-by Thomas Meyer <[email protected]>
Acked-by Kees Cook <[email protected]>

Thanks!

-Kees

Quoted 10 lines

---

diff -u -p a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c

drivers/firmware/efi/efi-pstore.c +0 -0
@@ -79,10 +79,9 @@ static int efi_pstore_read_func(struct e
                           &entry->var.DataSize, entry->var.Data);

drivers/firmware/efi/efi-pstore.c static int efi_pstore_read_func(struct e · line 87

Quoted 10 lines
drivers/firmware/efi/efi-pstore.c +1 -2
        size = entry->var.DataSize;
 
-       *cb_data->buf = kmalloc(size, GFP_KERNEL);
+       *cb_data->buf = kmemdup(entry->var.Data, size, GFP_KERNEL);
        if (*cb_data->buf == NULL)
                return -ENOMEM;
-       memcpy(*cb_data->buf, entry->var.Data, size);
        return size;
 }

--
Kees Cook
Chrome OS Security

#2 lore raw
In reply to Thomas Meyer
Quoted 8 lines · Thomas Meyer
Signed-off-by Thomas Meyer <[email protected]>

---

diff -u -p a/drivers/firmware/efi/efi-pstore.c b/drivers/firmware/efi/efi-pstore.c

drivers/firmware/efi/efi-pstore.c static int efi_pstore_read_func(struct e · line 86

Quoted 10 lines
drivers/firmware/efi/efi-pstore.c +1 -2
@@ -79,10 +79,9 @@ static int efi_pstore_read_func(struct e
 			   &entry->var.DataSize, entry->var.Data);
 	size = entry->var.DataSize;
 
-	*cb_data->buf = kmalloc(size, GFP_KERNEL);
+	*cb_data->buf = kmemdup(entry->var.Data, size, GFP_KERNEL);
 	if (*cb_data->buf == NULL)
 		return -ENOMEM;
-	memcpy(*cb_data->buf, entry->var.Data, size);
 	return size;
 }

Who wants to pick this one up? Tony?

Signature · 1 line
Matt Fleming, Intel Open Source Technology Center
reviewer
#3 lore raw
Quoted 1 line

Who wants to pick this one up? Tony?

Sure - I'll take it.

-Tony