Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac5e3af9 authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller
Browse files

net: sysfs: ethtool_ops can be NULL 



commit d519e17e
(net: export device speed and duplex via sysfs)
made the wrong assumption that netdev->ethtool_ops was always set.

This makes possible to crash kernel and let rtnl in locked state.

modprobe dummy
ip link set dummy0 up
(udev runs and crash)

Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
Acked-by: default avatarAndy Gospodarek <andy@greyhouse.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b75c6dbb

net/core/net-sysfs.c

+6 −2
Original line number Diff line number Diff line
@@ -139,7 +139,9 @@ static ssize_t show_speed(struct device *dev, 
	if (!rtnl_trylock())

		return restart_syscall();



	if (netif_running(netdev) && netdev->ethtool_ops->get_settings) {

	if (netif_running(netdev) &&

	    netdev->ethtool_ops &&

	    netdev->ethtool_ops->get_settings) {

		struct ethtool_cmd cmd = { ETHTOOL_GSET };



		if (!netdev->ethtool_ops->get_settings(netdev, &cmd))
@@ -158,7 +160,9 @@ static ssize_t show_duplex(struct device *dev, 
	if (!rtnl_trylock())

		return restart_syscall();



	if (netif_running(netdev) && netdev->ethtool_ops->get_settings) {

	if (netif_running(netdev) &&

	    netdev->ethtool_ops &&

	    netdev->ethtool_ops->get_settings) {

		struct ethtool_cmd cmd = { ETHTOOL_GSET };



		if (!netdev->ethtool_ops->get_settings(netdev, &cmd))