misc/genwqe: ensure zero initialization
Subsystems (2)
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
@@ -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
@@ -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
Hi Sebastian,
Quoted 10 lines · Sebastian Ott
Genwqe uses
dma_alloc_coherentand 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_coherentbut this is by no means guaranteed. Simply switch todma_zalloc_coherent.
Thanks for figuring this out. I hope you found all spots where this misassumption is done.
Quoted 38 lines
Signed-off-by Sebastian Ott <[email protected]>---
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@@ -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@@ -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.
Sebastian Ott
Acked-by Frank HaverkampQuoted 10 lines · Frank Haverkamp
Quoted 8 lines · Sebastian Ott
Genwqe uses
dma_alloc_coherentand 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_coherentbut this is by no means guaranteed. Simply switch todma_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.
Signed-off-by Frank Haverkamp <[email protected]>
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
@@ -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
@@ -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