diff options
author | Augusto Mecking Caringi <augustocaringi@gmail.com> | 2017-01-10 05:45:00 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-19 14:18:02 -0500 |
commit | 57bfd5a3710bff25e35974de6db8816103d44973 (patch) | |
tree | 084fe0e7f81026381131df31616b683783a502c6 | |
parent | 1f363639eb30c2a4ef9ff125e2fbfe213d82a2f9 (diff) |
vme: Fix wrong pointer utilization in ca91cx42_slave_get
commit c8a6a09c1c617402cc9254b2bc8da359a0347d75 upstream.
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;
Signed-off-by: Augusto Mecking Caringi <augustocaringi@gmail.com>
Acked-By: Martyn Welch <martyn@welchs.me.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/vme/bridges/vme_ca91cx42.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/vme/bridges/vme_ca91cx42.c b/drivers/vme/bridges/vme_ca91cx42.c index 6b5ee896af63..7cc51223db1c 100644 --- a/drivers/vme/bridges/vme_ca91cx42.c +++ b/drivers/vme/bridges/vme_ca91cx42.c | |||
@@ -464,7 +464,7 @@ static int ca91cx42_slave_get(struct vme_slave_resource *image, int *enabled, | |||
464 | vme_bound = ioread32(bridge->base + CA91CX42_VSI_BD[i]); | 464 | vme_bound = ioread32(bridge->base + CA91CX42_VSI_BD[i]); |
465 | pci_offset = ioread32(bridge->base + CA91CX42_VSI_TO[i]); | 465 | pci_offset = ioread32(bridge->base + CA91CX42_VSI_TO[i]); |
466 | 466 | ||
467 | *pci_base = (dma_addr_t)vme_base + pci_offset; | 467 | *pci_base = (dma_addr_t)*vme_base + pci_offset; |
468 | *size = (unsigned long long)((vme_bound - *vme_base) + granularity); | 468 | *size = (unsigned long long)((vme_bound - *vme_base) + granularity); |
469 | 469 | ||
470 | *enabled = 0; | 470 | *enabled = 0; |