Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH v1] can: c_can: fix null-ptr-deref on ioctl()
@ 2021-09-06 23:37 Tong Zhang
  2021-09-07  6:38 ` Marc Kleine-Budde
  0 siblings, 1 reply; 2+ messages in thread
From: Tong Zhang @ 2021-09-06 23:37 UTC (permalink / raw)
  To: Wolfgang Grandegger, Marc Kleine-Budde, David S. Miller,
	Jakub Kicinski, Tong Zhang, Andrew Lunn, Dario Binacchi,
	linux-can, netdev, linux-kernel

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
sould 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: 2722ac986e93 ("can: c_can: add ethtool support")
Signed-off-by: Tong Zhang <ztong0001@gmail.com>
---
 drivers/net/can/c_can/c_can_ethtool.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/net/can/c_can/c_can_ethtool.c b/drivers/net/can/c_can/c_can_ethtool.c
index cd5f07fca2a5..377c7d2e7612 100644
--- a/drivers/net/can/c_can/c_can_ethtool.c
+++ b/drivers/net/can/c_can/c_can_ethtool.c
@@ -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,
-- 
2.25.1


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH v1] can: c_can: fix null-ptr-deref on ioctl()
  2021-09-06 23:37 [PATCH v1] can: c_can: fix null-ptr-deref on ioctl() Tong Zhang
@ 2021-09-07  6:38 ` Marc Kleine-Budde
  0 siblings, 0 replies; 2+ messages in thread
From: Marc Kleine-Budde @ 2021-09-07  6:38 UTC (permalink / raw)
  To: Tong Zhang
  Cc: Wolfgang Grandegger, David S. Miller, Jakub Kicinski,
	Andrew Lunn, Dario Binacchi, linux-can, netdev, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 1174 bytes --]

On 06.09.2021 16:37:02, Tong Zhang wrote:
> 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
> sould match dev_name() string, so I am replacing this with dev_name() to
  ^^^^^
  should

Fixed while applying.

> 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: 2722ac986e93 ("can: c_can: add ethtool support")
> Signed-off-by: Tong Zhang <ztong0001@gmail.com>

Applied to linux-can/testing + added stable on Cc.

regards,
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: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-09-07  6:39 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-06 23:37 [PATCH v1] can: c_can: fix null-ptr-deref on ioctl() Tong Zhang
2021-09-07  6:38 ` Marc Kleine-Budde

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).