lkml.org 
[lkml]   [2009]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 19/56] firewire: sbp2: fix DMA mapping leak on the failure path
    2.6.27-stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: Stefan Richter <stefanr@s5r6.in-berlin.de>

    Commit 5e2125677fd72d36396cc537466e07ffcbbd4b2b upstream.

    Reported-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    who also provided a first version of the fix.

    Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/firewire/fw-sbp2.c | 27 +++++++++++++++++----------
    1 file changed, 17 insertions(+), 10 deletions(-)

    --- a/drivers/firewire/fw-sbp2.c
    +++ b/drivers/firewire/fw-sbp2.c
    @@ -1293,6 +1293,19 @@ static struct fw_driver sbp2_driver = {
    .id_table = sbp2_id_table,
    };

    +static void sbp2_unmap_scatterlist(struct device *card_device,
    + struct sbp2_command_orb *orb)
    +{
    + if (scsi_sg_count(orb->cmd))
    + dma_unmap_sg(card_device, scsi_sglist(orb->cmd),
    + scsi_sg_count(orb->cmd),
    + orb->cmd->sc_data_direction);
    +
    + if (orb->request.misc & cpu_to_be32(COMMAND_ORB_PAGE_TABLE_PRESENT))
    + dma_unmap_single(card_device, orb->page_table_bus,
    + sizeof(orb->page_table), DMA_TO_DEVICE);
    +}
    +
    static unsigned int
    sbp2_status_to_sense_data(u8 *sbp2_status, u8 *sense_data)
    {
    @@ -1372,15 +1385,7 @@ complete_command_orb(struct sbp2_orb *ba

    dma_unmap_single(device->card->device, orb->base.request_bus,
    sizeof(orb->request), DMA_TO_DEVICE);
    -
    - if (scsi_sg_count(orb->cmd) > 0)
    - dma_unmap_sg(device->card->device, scsi_sglist(orb->cmd),
    - scsi_sg_count(orb->cmd),
    - orb->cmd->sc_data_direction);
    -
    - if (orb->page_table_bus != 0)
    - dma_unmap_single(device->card->device, orb->page_table_bus,
    - sizeof(orb->page_table), DMA_TO_DEVICE);
    + sbp2_unmap_scatterlist(device->card->device, orb);

    orb->cmd->result = result;
    orb->done(orb->cmd);
    @@ -1530,8 +1535,10 @@ static int sbp2_scsi_queuecommand(struct
    orb->base.request_bus =
    dma_map_single(device->card->device, &orb->request,
    sizeof(orb->request), DMA_TO_DEVICE);
    - if (dma_mapping_error(device->card->device, orb->base.request_bus))
    + if (dma_mapping_error(device->card->device, orb->base.request_bus)) {
    + sbp2_unmap_scatterlist(device->card->device, orb);
    goto out;
    + }

    sbp2_send_orb(&orb->base, lu, lu->tgt->node_id, lu->generation,
    lu->command_block_agent_address + SBP2_ORB_POINTER);


    \
     
     \ /
      Last update: 2009-02-11 01:37    [W:0.024 / U:30.972 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site