patch "vme: Fix wrong pointer utilization in ca91cx42_slave_get" added to char-misc-linus
This is a note to let you know that I've just added the patch titled
vme: Fix wrong pointer utilization in ca91cx42_slave_get
to my char-misc git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
in the char-misc-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
c8a6a09c1c617402cc9254b2bc8da359a0347d75Mon Sep 17 00:00:00 2001
From: Augusto Mecking Caringi <[email protected]>
Date: Tue, 10 Jan 2017 10:45:00 +0000
Subject: vme: Fix wrong pointer utilization in ca91cx42_slave_get
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
In ca91cx42_slave_get function, the value pointed by vme_base pointer is set through:
*vme_base = ioread32(bridge->base + CA91CX42_VSI_BS[i]);
So it must be dereferenced to be used in calculation of pci_base:
*pci_base = (dma_addr_t)*vme_base + pci_offset;
This bug was caught thanks to the following gcc warning:
drivers/vme/bridges/vme_ca91cx42.c: In function ‘ca91cx42_slave_get’:drivers/vme/bridges/vme_ca91cx42.c:467:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] *pci_base = (dma_addr_t)vme_base + pci_offset;
--- drivers/vme/bridges/vme_ca91cx42.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vme/bridges/vme_ca91cx42.c +1 -1
@@ -464,7 +464,7 @@ static int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled, vme_bound =ioread32 (bridge->base +CA91CX42_VSI_BD [i]); pci_offset =ioread32 (bridge->base +CA91CX42_VSI_TO [i]); - *pci_base = (dma_addr_t )vme_base + pci_offset; + *pci_base = (dma_addr_t)*vme_base + pci_offset; *size = (unsigned long long )((vme_bound - *vme_base) + granularity); *enabled =0 ;
Signature · 1 line
2.11.0