Re: [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one
On Wed, Jan 13, 2021 at 03:31:00PM +0800, Qinglang Miao wrote: > If alloc_canfd_skb returns NULL, 'cfg' is an uninitialized > variable, so we should check 'skb' rather than 'cfd' after > calling alloc_canfd_skb(priv->ndev, &cfd). > > Fixes: 55e5b97f003e ("can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI > CAN") > Signed-off-by: Qinglang Miao Reviewed-by: Manivannan Sadhasivam Thanks, Mani > --- > drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > index 77129d5f4..792d55ba4 100644 > --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c > @@ -1492,7 +1492,7 @@ mcp251xfd_handle_rxif_one(struct mcp251xfd_priv *priv, > else > skb = alloc_can_skb(priv->ndev, (struct can_frame **)&cfd); > > - if (!cfd) { > + if (!skb) { > stats->rx_dropped++; > return 0; > } > -- > 2.23.0 >
Re: [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one
On 1/13/21 8:31 AM, Qinglang Miao wrote: > If alloc_canfd_skb returns NULL, 'cfg' is an uninitialized > variable, so we should check 'skb' rather than 'cfd' after > calling alloc_canfd_skb(priv->ndev, &cfd). > > Fixes: 55e5b97f003e ("can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI > CAN") > Signed-off-by: Qinglang Miao applied to linux-can/testing Tnx, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung West/Dortmund | Phone: +49-231-2826-924 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | signature.asc Description: OpenPGP digital signature
[PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one
If alloc_canfd_skb returns NULL, 'cfg' is an uninitialized variable, so we should check 'skb' rather than 'cfd' after calling alloc_canfd_skb(priv->ndev, &cfd). Fixes: 55e5b97f003e ("can: mcp25xxfd: add driver for Microchip MCP25xxFD SPI CAN") Signed-off-by: Qinglang Miao --- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c index 77129d5f4..792d55ba4 100644 --- a/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c +++ b/drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c @@ -1492,7 +1492,7 @@ mcp251xfd_handle_rxif_one(struct mcp251xfd_priv *priv, else skb = alloc_can_skb(priv->ndev, (struct can_frame **)&cfd); - if (!cfd) { + if (!skb) { stats->rx_dropped++; return 0; } -- 2.23.0