| Message ID | 20210113073100.79552-1-miaoqinglang@huawei.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one | expand |
| Context | Check | Description |
|---|---|---|
| netdev/tree_selection | success | Series ignored based on subject |
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 <miaoqinglang@huawei.com> applied to linux-can/testing Tnx, Marc
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 <miaoqinglang@huawei.com> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> 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 >
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; }
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 <miaoqinglang@huawei.com> --- drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)