linux-kernel - Re: [PATCH net-next v1 1/4] net-e1000e: fix ethtool set_features taking new features into account too late

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAHXqBFKGym1+AkXmEGeTzXeF_hvzfXoMEKrHBNSK5htHKf9PoQ@mail.gmail.com>
Date:	Tue, 22 Nov 2011 01:00:09 +0100
From:	Michał Mirosław <mirqus@...il.com>
To:	David Decotigny <david.decotigny@...gle.com>
Cc:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>,
	Jesse Brandeburg <jesse.brandeburg@...el.com>,
	Bruce Allan <bruce.w.allan@...el.com>,
	Carolyn Wyborny <carolyn.wyborny@...el.com>,
	Don Skidmore <donald.c.skidmore@...el.com>,
	Greg Rose <gregory.v.rose@...el.com>,
	Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@...el.com>,
	Alex Duyck <alexander.h.duyck@...el.com>,
	John Ronciak <john.ronciak@...el.com>,
	e1000-devel@...ts.sourceforge.net, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org,
	"David S. Miller" <davem@...emloft.net>,
	Eric Dumazet <eric.dumazet@...il.com>,
	Ian Campbell <ian.campbell@...rix.com>,
	Paul Gortmaker <paul.gortmaker@...driver.com>
Subject: Re: [PATCH net-next v1 1/4] net-e1000e: fix ethtool set_features
 taking new features into account too late

2011/11/22 David Decotigny <david.decotigny@...gle.com>:
[...]
> diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
> index a5bd7a3..b63f316 100644
> --- a/drivers/net/ethernet/intel/e1000e/netdev.c
> +++ b/drivers/net/ethernet/intel/e1000e/netdev.c
> @@ -5901,24 +5901,28 @@ static void e1000_eeprom_checks(struct e1000_adapter *adapter)
>  }
>
>  static int e1000_set_features(struct net_device *netdev,
> -       netdev_features_t features)
> +                             netdev_features_t features)
>  {
>        struct e1000_adapter *adapter = netdev_priv(netdev);
>        netdev_features_t changed = features ^ netdev->features;
> +       int retval = 1;  /* telling netdev that we are updating
> +                         * netdev->features by ourselves */
> +
> +       netdev->features = features;
>
>        if (changed & (NETIF_F_TSO | NETIF_F_TSO6))
>                adapter->flags |= FLAG_TSO_FORCE;
>
>        if (!(changed & (NETIF_F_HW_VLAN_RX | NETIF_F_HW_VLAN_TX |
>                         NETIF_F_RXCSUM)))
> -               return 0;
> +               return retval;
>

Would be less code if you set netdev->features here...

>        if (netif_running(netdev))
>                e1000e_reinit_locked(adapter);
>        else
>                e1000e_reset(adapter);
>
> -       return 0;
> +       return retval;

... and return 1 here, noting in a comment that e1000e_reinit_locked()
might have changed netdev->features.

>  }

Best Regards,
Michał Mirosław
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/