Skip to contentSkip to conversation

misc/genwqe: ensure zero initialization

PATCH In review Sebastian Ott 2 participants 3 messages Sep 12, 2016 – Sep 23, 2016

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 misc/genwqe: ensure zero initialization

Genwqe uses dma_alloc_coherent and depends on zero initialized memory. On one occasion it ueses an explicit memset on others it uses un-initialized memory.

This bug was covered because some archs actually return zero initialized memory when using dma_alloc_coherent but this is by no means guaranteed. Simply switch to dma_zalloc_coherent.

---
 drivers/misc/genwqe/card_ddcb.c  | 2 --
 drivers/misc/genwqe/card_utils.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/misc/genwqe/card_ddcb.c +0 -2
index 353ee0c..ddfeefe 100644
@@ -1048,8 +1048,6 @@ static int setup_ddcb_queue(struct genwqe_dev *cd, struct ddcb_queue *queue)
 			"[%s] **err: could not allocate DDCB **\n", __func__);
 		return -ENOMEM;
 	}
-	memset(queue->ddcb_vaddr, 0, queue_size);
-
 	queue->ddcb_req = kzalloc(sizeof(struct ddcb_requ *) *
 				  queue->ddcb_max, GFP_KERNEL);
 	if (!queue->ddcb_req) {
drivers/misc/genwqe/card_utils.c +2 -2
index 222367c..8a679ec 100644
@@ -220,8 +220,8 @@ void *__genwqe_alloc_consistent(struct genwqe_dev *cd, size_t size,
 	if (get_order(size) > MAX_ORDER)
 		return NULL;
 
-	return dma_alloc_coherent(&cd->pci_dev->dev, size, dma_handle,
-				  GFP_KERNEL);
+	return dma_zalloc_coherent(&cd->pci_dev->dev, size, dma_handle,
+				   GFP_KERNEL);
 }
 
 void __genwqe_free_consistent(struct genwqe_dev *cd, size_t size,
Signature · 1 line
2.5.5
#1 lore raw

Hi Sebastian,

Quoted 10 lines · Sebastian Ott

Genwqe uses dma_alloc_coherent and depends on zero initialized memory. On one occasion it ueses an explicit memset on others it uses un-initialized memory.

This bug was covered because some archs actually return zero initialized memory when using dma_alloc_coherent but this is by no means guaranteed. Simply switch to dma_zalloc_coherent.

Thanks for figuring this out. I hope you found all spots where this misassumption is done.

Quoted 38 lines

---
drivers/misc/genwqe/card_ddcb.c | 2 --
drivers/misc/genwqe/card_utils.c | 4 ++--

2 files changed, 2 insertions(+), 4 deletions(-)
drivers/misc/genwqe/card_ddcb.c +0 -2
index 353ee0c..ddfeefe 100644
@@ -1048,8 +1048,6 @@ static int setup_ddcb_queue(struct genwqe_dev *cd, struct ddcb_queue *queue)
 			"[%s] **err: could not allocate DDCB **\n", __func__);
 		return -ENOMEM;
 	}
-	memset(queue->ddcb_vaddr, 0, queue_size);
-
 	queue->ddcb_req = kzalloc(sizeof(struct ddcb_requ *) *
 				  queue->ddcb_max, GFP_KERNEL);
 	if (!queue->ddcb_req) {
drivers/misc/genwqe/card_utils.c +2 -2
index 222367c..8a679ec 100644
@@ -220,8 +220,8 @@ void *__genwqe_alloc_consistent(struct genwqe_dev *cd, size_t size,
 	if (get_order(size) > MAX_ORDER)
 		return NULL;
 
-	return dma_alloc_coherent(&cd->pci_dev->dev, size, dma_handle,
-				  GFP_KERNEL);
+	return dma_zalloc_coherent(&cd->pci_dev->dev, size, dma_handle,
+				   GFP_KERNEL);
 }
 
 void __genwqe_free_consistent(struct genwqe_dev *cd, size_t size,
Signature · 1 line
2.5.5

I think this should be fine.

author Acked-by Frank Haverkamp
#2 lore raw
Quoted 10 lines · Frank Haverkamp
Quoted 8 lines · Sebastian Ott

Genwqe uses dma_alloc_coherent and depends on zero initialized memory. On one occasion it ueses an explicit memset on others it uses un-initialized memory.

This bug was covered because some archs actually return zero initialized memory when using dma_alloc_coherent but this is by no means guaranteed. Simply switch to dma_zalloc_coherent.

Thanks for figuring this out. I hope you found all spots where this misassumption is done.

Genwqe only uses the dma alloc API via a wrapper (__genwqe_alloc_consistent) and I changed it there.

Quoted 3 lines

I think this should be fine.

I changed that into an Ack. Seems more fitting here. Also I fixed a typo in the patch description.

Greg, would you please take this one via your drivers/misc tree.

Thanks,
Sebastian

-------->8
misc/genwqe: ensure zero initialization

Genwqe uses dma_alloc_coherent and depends on zero initialized memory. On one occasion it uses an explicit memset on others it uses un-initialized memory.

This bug was covered because some archs actually return zero initialized memory when using dma_alloc_coherent but this is by no means guaranteed. Simply switch to dma_zalloc_coherent.

---
 drivers/misc/genwqe/card_ddcb.c  | 2 --
 drivers/misc/genwqe/card_utils.c | 4 ++--
 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/misc/genwqe/card_ddcb.c +0 -2
index 353ee0c..ddfeefe 100644
@@ -1048,8 +1048,6 @@ static int setup_ddcb_queue(struct genwqe_dev *cd, struct ddcb_queue *queue)
 			"[%s] **err: could not allocate DDCB **\n", __func__);
 		return -ENOMEM;
 	}
-	memset(queue->ddcb_vaddr, 0, queue_size);
-
 	queue->ddcb_req = kzalloc(sizeof(struct ddcb_requ *) *
 				  queue->ddcb_max, GFP_KERNEL);
 	if (!queue->ddcb_req) {
drivers/misc/genwqe/card_utils.c +2 -2
index 222367c..8a679ec 100644
@@ -220,8 +220,8 @@ void *__genwqe_alloc_consistent(struct genwqe_dev *cd, size_t size,
 	if (get_order(size) > MAX_ORDER)
 		return NULL;
 
-	return dma_alloc_coherent(&cd->pci_dev->dev, size, dma_handle,
-				  GFP_KERNEL);
+	return dma_zalloc_coherent(&cd->pci_dev->dev, size, dma_handle,
+				   GFP_KERNEL);
 }
 
 void __genwqe_free_consistent(struct genwqe_dev *cd, size_t size,
Signature · 1 line
2.5.5