Skip to content

Commit

Permalink
can: flexcan: fix an use-after-free in flexcan_setup_stop_mode()
Browse files Browse the repository at this point in the history
The gpr_np variable is still being used in dev_dbg() after the
of_node_put() call, which may result in use-after-free.

Fixes: de3578c ("can: flexcan: add self wakeup support")
Signed-off-by: Wen Yang <wen.yang99@zte.com.cn>
Cc: linux-stable <stable@vger.kernel.org> # >= v5.0
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
  • Loading branch information
Wen Yang authored and Marc Kleine-Budde committed Jul 24, 2019
1 parent 375f755 commit e9f2a85
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions drivers/net/can/flexcan.c
Original file line number Diff line number Diff line change
Expand Up @@ -1437,10 +1437,10 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev)

priv = netdev_priv(dev);
priv->stm.gpr = syscon_node_to_regmap(gpr_np);
of_node_put(gpr_np);
if (IS_ERR(priv->stm.gpr)) {
dev_dbg(&pdev->dev, "could not find gpr regmap\n");
return PTR_ERR(priv->stm.gpr);
ret = PTR_ERR(priv->stm.gpr);
goto out_put_node;
}

priv->stm.req_gpr = out_val[1];
Expand All @@ -1455,7 +1455,9 @@ static int flexcan_setup_stop_mode(struct platform_device *pdev)

device_set_wakeup_capable(&pdev->dev, true);

return 0;
out_put_node:
of_node_put(gpr_np);
return ret;
}

static const struct of_device_id flexcan_of_match[] = {
Expand Down

0 comments on commit e9f2a85

Please sign in to comment.