| Message ID | 20190206153514.GA11033@kadam |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net] net: dsa: Fix NULL checking in dsa_slave_set_eee() | expand |
On 2/6/19 7:35 AM, Dan Carpenter wrote: > This function can't succeed if dp->pl is NULL. It will Oops inside the > call to return phylink_ethtool_get_eee(dp->pl, e); > > Fixes: 1be52e97ed3e ("dsa: slave: eee: Allow ports to use phylink") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> thanks Dan!
On Wed, 6 Feb 2019 18:35:15 +0300, Dan Carpenter <dan.carpenter@oracle.com> wrote: > This function can't succeed if dp->pl is NULL. It will Oops inside the > call to return phylink_ethtool_get_eee(dp->pl, e); > > Fixes: 1be52e97ed3e ("dsa: slave: eee: Allow ports to use phylink") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Reviewed-by: Vivien Didelot <vivien.didelot@gmail.com>
From: Dan Carpenter <dan.carpenter@oracle.com> Date: Wed, 6 Feb 2019 18:35:15 +0300 > This function can't succeed if dp->pl is NULL. It will Oops inside the > call to return phylink_ethtool_get_eee(dp->pl, e); > > Fixes: 1be52e97ed3e ("dsa: slave: eee: Allow ports to use phylink") > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied and queued up for -stable.
diff --git a/net/dsa/slave.c b/net/dsa/slave.c index 91de3a663226..9384f95e04d5 100644 --- a/net/dsa/slave.c +++ b/net/dsa/slave.c @@ -639,7 +639,7 @@ static int dsa_slave_set_eee(struct net_device *dev, struct ethtool_eee *e) int ret; /* Port's PHY and MAC both need to be EEE capable */ - if (!dev->phydev && !dp->pl) + if (!dev->phydev || !dp->pl) return -ENODEV; if (!ds->ops->set_mac_eee) @@ -659,7 +659,7 @@ static int dsa_slave_get_eee(struct net_device *dev, struct ethtool_eee *e) int ret; /* Port's PHY and MAC both need to be EEE capable */ - if (!dev->phydev && !dp->pl) + if (!dev->phydev || !dp->pl) return -ENODEV; if (!ds->ops->get_mac_eee)
This function can't succeed if dp->pl is NULL. It will Oops inside the call to return phylink_ethtool_get_eee(dp->pl, e); Fixes: 1be52e97ed3e ("dsa: slave: eee: Allow ports to use phylink") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> --- net/dsa/slave.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)