* [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one
@ 2021-01-13 7:31 Qinglang Miao
2021-01-13 7:56 ` Marc Kleine-Budde
2021-01-13 7:57 ` Manivannan Sadhasivam
0 siblings, 2 replies; 3+ messages in thread
From: Qinglang Miao @ 2021-01-13 7:31 UTC (permalink / raw)
To: Marc Kleine-Budde, Manivannan Sadhasivam, Thomas Kopp,
Wolfgang Grandegger, David S. Miller, Jakub Kicinski
Cc: linux-can, netdev, linux-kernel, Qinglang Miao
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(-)
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one
2021-01-13 7:31 [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one Qinglang Miao
@ 2021-01-13 7:56 ` Marc Kleine-Budde
2021-01-13 7:57 ` Manivannan Sadhasivam
1 sibling, 0 replies; 3+ messages in thread
From: Marc Kleine-Budde @ 2021-01-13 7:56 UTC (permalink / raw)
To: Qinglang Miao, Manivannan Sadhasivam, Thomas Kopp,
Wolfgang Grandegger, David S. Miller, Jakub Kicinski
Cc: linux-can, netdev, linux-kernel
[-- Attachment #1.1: Type: text/plain, Size: 679 bytes --]
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
--
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-5555 |
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one
2021-01-13 7:31 [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one Qinglang Miao
2021-01-13 7:56 ` Marc Kleine-Budde
@ 2021-01-13 7:57 ` Manivannan Sadhasivam
1 sibling, 0 replies; 3+ messages in thread
From: Manivannan Sadhasivam @ 2021-01-13 7:57 UTC (permalink / raw)
To: Qinglang Miao
Cc: Marc Kleine-Budde, Thomas Kopp, Wolfgang Grandegger,
David S. Miller, Jakub Kicinski, linux-can, netdev, linux-kernel
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
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-01-13 7:58 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-01-13 7:31 [PATCH] can: mcp251xfd: fix wrong check in mcp251xfd_handle_rxif_one Qinglang Miao
2021-01-13 7:56 ` Marc Kleine-Budde
2021-01-13 7:57 ` Manivannan Sadhasivam
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).