On 05.05.21 09:51, Marc Kleine-Budde wrote:
> On 05.05.2021 09:14:15, Frieder Schrempf wrote:
>> From: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx>
>>
>> Since 8ce8c0abcba3 the driver queues work via priv->restart_work when
>> resuming after suspend, even when the interface was not previously
>> enabled. This causes a null dereference error as the workqueue is
>> only allocated and initialized in mcp251x_open().
>>
>> To fix this we move the workqueue init to mcp251x_can_probe() as
>> there is no reason to do it later and repeat it whenever
>> mcp251x_open() is called.
>>
>> Fixes: 8ce8c0abcba3 ("can: mcp251x: only reset hardware as required")
>> Cc: stable@xxxxxxxxxxxxxxx
>> Signed-off-by: Frieder Schrempf <frieder.schrempf@xxxxxxxxxx>
>> Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
>> ---
>> Changes in v2:
>> * Remove the out_clean label in mcp251x_open()
>> * Add Andy's R-b tag
>> * Add 'From' tag
>>
>> Hi Marc, I'm sending a v2 mainly because I noticed that v1 is missing
>> the 'From' tag and as my company's mailserver always sends my name
>> reversed this causes incorrect author information in git. So if possible
>> you could fix this up. If this is too much work, just leave it as is.
>> Thanks!
>
> Done.
Thanks!
>
> I've also squashed this fixup:
Oh dear, I really should have looked at this more closely.
Thanks a lot and sorry for the mess!
>
> | --- a/drivers/net/can/spi/mcp251x.c
> | +++ b/drivers/net/can/spi/mcp251x.c
> | @@ -1224,13 +1224,13 @@ static int mcp251x_open(struct net_device *net)
> |
> | ret = mcp251x_hw_wake(spi);
> | if (ret)
> | - goto out_free_wq;
> | + goto out_free_irq;
> | ret = mcp251x_setup(net, spi);
> | if (ret)
> | - goto out_free_wq;
> | + goto out_free_irq;
> | ret = mcp251x_set_normal_mode(spi);
> | if (ret)
> | - goto out_free_wq;
> | + goto out_free_irq;
> |
> | can_led_event(net, CAN_LED_EVENT_OPEN);
> |
> | @@ -1239,8 +1239,7 @@ static int mcp251x_open(struct net_device *net)
> |
> | return 0;
> |
> | -out_free_wq:
> | - destroy_workqueue(priv->wq);
> | +out_free_irq:
> | free_irq(spi->irq, priv);
> | mcp251x_hw_sleep(spi);
> | out_close:
>
> Marc
>
