lkml.org 
[lkml]   [2020]   [May]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.6 36/62] stmmac: fix pointer check after utilization in stmmac_interrupt
    Date
    From: Maxim Petrov <mmrmaximuzz@gmail.com>

    [ Upstream commit f42234ffd531ca6b13d9da02faa60b72eccf8334 ]

    The paranoidal pointer check in IRQ handler looks very strange - it
    really protects us only against bogus drivers which request IRQ line
    with null pointer dev_id. However, the code fragment is incorrect
    because the dev pointer is used before the actual check which leads
    to undefined behavior. Remove the check to avoid confusing people
    with incorrect code.

    Signed-off-by: Maxim Petrov <mmrmaximuzz@gmail.com>
    Signed-off-by: David S. Miller <davem@davemloft.net>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 7 +------
    1 file changed, 1 insertion(+), 6 deletions(-)

    diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    index 7da18c9afa01d..d564459290ce1 100644
    --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c
    @@ -3988,7 +3988,7 @@ static int stmmac_set_features(struct net_device *netdev,
    /**
    * stmmac_interrupt - main ISR
    * @irq: interrupt number.
    - * @dev_id: to pass the net device pointer.
    + * @dev_id: to pass the net device pointer (must be valid).
    * Description: this is the main driver interrupt service routine.
    * It can call:
    * o DMA service routine (to manage incoming frame reception and transmission
    @@ -4012,11 +4012,6 @@ static irqreturn_t stmmac_interrupt(int irq, void *dev_id)
    if (priv->irq_wake)
    pm_wakeup_event(priv->device, 0);

    - if (unlikely(!dev)) {
    - netdev_err(priv->dev, "%s: invalid dev pointer\n", __func__);
    - return IRQ_NONE;
    - }
    -
    /* Check if adapter is up */
    if (test_bit(STMMAC_DOWN, &priv->state))
    return IRQ_HANDLED;
    --
    2.20.1
    \
     
     \ /
      Last update: 2020-05-14 21:11    [W:2.173 / U:0.796 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site