lkml.org 
[lkml]   [2017]   [Mar]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 107/199] vme: Fix wrong pointer utilization in ca91cx42_slave_get
    3.2.87-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Augusto Mecking Caringi <augustocaringi@gmail.com>

    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>
    [bwh: Backported to 3.2: adjust filename]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/staging/vme/bridges/vme_ca91cx42.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/staging/vme/bridges/vme_ca91cx42.c
    +++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
    @@ -466,7 +466,7 @@ static int ca91cx42_slave_get(struct vme
    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;
    \
     
     \ /
      Last update: 2017-03-10 12:54    [W:4.120 / U:0.060 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site