lkml.org 
[lkml]   [2010]   [Oct]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 23/30] staging/vme_user: fix usage of the slave resources after they've been freed
    Date
    From: Emilio G. Cota <cota@braap.org>

    buf_unalloc() frees the memory buffers allocated with vme_alloc_consistent.
    The associated VME resource is needed in both vme_alloc_consistent and
    vme_free_consistent; however the slave VME resources are being freed before
    the calls to vme_free_consistent are made, which means the buffers
    are never returned.

    Fix this by freeing the VME resources only after the consistent buffers have
    been returned.

    Signed-off-by: Emilio G. Cota <cota@braap.org>
    ---
    drivers/staging/vme/devices/vme_user.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/staging/vme/devices/vme_user.c b/drivers/staging/vme/devices/vme_user.c
    index 5def455..95c22ff 100644
    --- a/drivers/staging/vme/devices/vme_user.c
    +++ b/drivers/staging/vme/devices/vme_user.c
    @@ -826,8 +826,8 @@ err_master:
    err_slave:
    while (i > SLAVE_MINOR) {
    i--;
    - vme_slave_free(image[i].resource);
    buf_unalloc(i);
    + vme_slave_free(image[i].resource);
    }
    err_class:
    cdev_del(vme_user_cdev);
    @@ -852,8 +852,8 @@ static int __devexit vme_user_remove(struct device *dev, int cur_bus, int cur_sl

    for (i = SLAVE_MINOR; i < (SLAVE_MAX + 1); i++) {
    vme_slave_set(image[i].resource, 0, 0, 0, 0, VME_A32, 0);
    - vme_slave_free(image[i].resource);
    buf_unalloc(i);
    + vme_slave_free(image[i].resource);
    }

    /* Unregister device driver */
    --
    1.7.1


    \
     
     \ /
      Last update: 2010-10-26 03:15    [W:0.019 / U:33.808 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site