]> git.baikalelectronics.ru Git - kernel.git/commitdiff
can: c_can: fix null-ptr-deref on ioctl()
authorTong Zhang <ztong0001@gmail.com>
Mon, 6 Sep 2021 23:37:02 +0000 (16:37 -0700)
committerMarc Kleine-Budde <mkl@pengutronix.de>
Tue, 7 Sep 2021 06:46:58 +0000 (08:46 +0200)
The pdev maybe not a platform device, e.g. c_can_pci device, in this
case, calling to_platform_device() would not make sense. Also, per the
comment in drivers/net/can/c_can/c_can_ethtool.c, @bus_info should
match dev_name() string, so I am replacing this with dev_name() to fix
this issue.

[    1.458583] BUG: unable to handle page fault for address: 0000000100000000
[    1.460921] RIP: 0010:strnlen+0x1a/0x30
[    1.466336]  ? c_can_get_drvinfo+0x65/0xb0 [c_can]
[    1.466597]  ethtool_get_drvinfo+0xae/0x360
[    1.466826]  dev_ethtool+0x10f8/0x2970
[    1.467880]  sock_ioctl+0xef/0x300

Fixes: f3dee2657218 ("can: c_can: add ethtool support")
Link: https://lore.kernel.org/r/20210906233704.1162666-1-ztong0001@gmail.com
Cc: stable@vger.kernel.org # 5.14+
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
drivers/net/can/c_can/c_can_ethtool.c

index cd5f07fca2a568ffb12384b6414246a182db9781..377c7d2e761207a01aac4ef5ae92ee5323ebffd3 100644 (file)
@@ -15,10 +15,8 @@ static void c_can_get_drvinfo(struct net_device *netdev,
                              struct ethtool_drvinfo *info)
 {
        struct c_can_priv *priv = netdev_priv(netdev);
-       struct platform_device *pdev = to_platform_device(priv->device);
-
        strscpy(info->driver, "c_can", sizeof(info->driver));
-       strscpy(info->bus_info, pdev->name, sizeof(info->bus_info));
+       strscpy(info->bus_info, dev_name(priv->device), sizeof(info->bus_info));
 }
 
 static void c_can_get_ringparam(struct net_device *netdev,