* [PATCH net-next-2.6] net: sysfs: ethtool_ops can be NULL
@ 2009-10-26 11:23 Eric Dumazet
2009-10-26 13:40 ` Andy Gospodarek
0 siblings, 1 reply; 3+ messages in thread
From: Eric Dumazet @ 2009-10-26 11:23 UTC (permalink / raw)
To: David S. Miller; +Cc: Linux Netdev List, Andy Gospodarek
commit d519e17e2d01a0ee9abe083019532061b4438065
(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: Eric Dumazet <eric.dumazet@gmail.com>
---
net/core/net-sysfs.c | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
index 753c420..89de182 100644
--- a/net/core/net-sysfs.c
+++ b/net/core/net-sysfs.c
@@ -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))
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next-2.6] net: sysfs: ethtool_ops can be NULL
2009-10-26 11:23 [PATCH net-next-2.6] net: sysfs: ethtool_ops can be NULL Eric Dumazet
@ 2009-10-26 13:40 ` Andy Gospodarek
2009-10-28 11:02 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Andy Gospodarek @ 2009-10-26 13:40 UTC (permalink / raw)
To: Eric Dumazet; +Cc: David S. Miller, Linux Netdev List, Andy Gospodarek
On Mon, Oct 26, 2009 at 12:23:33PM +0100, Eric Dumazet wrote:
> commit d519e17e2d01a0ee9abe083019532061b4438065
> (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: Eric Dumazet <eric.dumazet@gmail.com>
> ---
> net/core/net-sysfs.c | 8 ++++++--
> 1 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c
> index 753c420..89de182 100644
> --- a/net/core/net-sysfs.c
> +++ b/net/core/net-sysfs.c
> @@ -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))
Nice catch, Eric.
Acked-by: Andy Gospodarek <andy@greyhouse.net>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next-2.6] net: sysfs: ethtool_ops can be NULL
2009-10-26 13:40 ` Andy Gospodarek
@ 2009-10-28 11:02 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2009-10-28 11:02 UTC (permalink / raw)
To: andy; +Cc: eric.dumazet, netdev
From: Andy Gospodarek <andy@greyhouse.net>
Date: Mon, 26 Oct 2009 09:40:33 -0400
> On Mon, Oct 26, 2009 at 12:23:33PM +0100, Eric Dumazet wrote:
>> commit d519e17e2d01a0ee9abe083019532061b4438065
>> (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: Eric Dumazet <eric.dumazet@gmail.com>
...
> Nice catch, Eric.
>
> Acked-by: Andy Gospodarek <andy@greyhouse.net>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-10-28 11:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-26 11:23 [PATCH net-next-2.6] net: sysfs: ethtool_ops can be NULL Eric Dumazet
2009-10-26 13:40 ` Andy Gospodarek
2009-10-28 11:02 ` David Miller
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).