lkml.org 
[lkml]   [2020]   [Jun]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 143/261] ice: fix potential double free in probe unrolling
    Date
    From: Jacob Keller <jacob.e.keller@intel.com>

    [ Upstream commit bc3a024101ca497bea4c69be4054c32a5c349f1d ]

    If ice_init_interrupt_scheme fails, ice_probe will jump to clearing up
    the interrupts. This can lead to some static analysis tools such as the
    compiler sanitizers complaining about double free problems.

    Since ice_init_interrupt_scheme already unrolls internally on failure,
    there is no need to call ice_clear_interrupt_scheme when it fails. Add
    a new unroll label and use that instead.

    Signed-off-by: Jacob Keller <jacob.e.keller@intel.com>
    Tested-by: Andrew Bowers <andrewx.bowers@intel.com>
    Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/intel/ice/ice_main.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
    index 2408f0de95fc..d0ccb7ad447b 100644
    --- a/drivers/net/ethernet/intel/ice/ice_main.c
    +++ b/drivers/net/ethernet/intel/ice/ice_main.c
    @@ -2900,7 +2900,7 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
    if (err) {
    dev_err(dev, "ice_init_interrupt_scheme failed: %d\n", err);
    err = -EIO;
    - goto err_init_interrupt_unroll;
    + goto err_init_vsi_unroll;
    }

    /* Driver is mostly up */
    @@ -2986,6 +2986,7 @@ err_msix_misc_unroll:
    ice_free_irq_msix_misc(pf);
    err_init_interrupt_unroll:
    ice_clear_interrupt_scheme(pf);
    +err_init_vsi_unroll:
    devm_kfree(dev, pf->vsi);
    err_init_pf_unroll:
    ice_deinit_pf(pf);
    --
    2.25.1


    \
     
     \ /
      Last update: 2020-06-19 17:11    [W:2.927 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site