diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2012-01-03 11:59:30 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-01-04 14:09:10 -0500 |
| commit | 3a73e49caa75928149ea54f570f8afb5f6f4774d (patch) | |
| tree | d8e61c5056c497690ec5d0bddfcfce0d8180f916 /drivers/net/ethernet/freescale/gianfar_ethtool.c | |
| parent | net/smsc911x: Check if PHY is in operational mode before software reset (diff) | |
| download | linux-dev-3a73e49caa75928149ea54f570f8afb5f6f4774d.tar.xz linux-dev-3a73e49caa75928149ea54f570f8afb5f6f4774d.zip | |
gianfar: Reject out-of-range RX NFC locations
Currently the driver only uses location values to maintain an ordered
list of filters. Make it reject location values >= MAX_FILER_IDX
passed to the ETHTOOL_SRXCLSRLINS command, consistent with the range
it reports for the ETHTOOL_GRXCLSRLALL command.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Sebastian Pöhn <sebastian.poehn@googlemail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/gianfar_ethtool.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/gianfar_ethtool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/gianfar_ethtool.c b/drivers/net/ethernet/freescale/gianfar_ethtool.c index 5890f4b0c0da..5a3b2e5b2880 100644 --- a/drivers/net/ethernet/freescale/gianfar_ethtool.c +++ b/drivers/net/ethernet/freescale/gianfar_ethtool.c @@ -1692,8 +1692,9 @@ static int gfar_set_nfc(struct net_device *dev, struct ethtool_rxnfc *cmd) ret = gfar_set_hash_opts(priv, cmd); break; case ETHTOOL_SRXCLSRLINS: - if (cmd->fs.ring_cookie != RX_CLS_FLOW_DISC && - cmd->fs.ring_cookie >= priv->num_rx_queues) { + if ((cmd->fs.ring_cookie != RX_CLS_FLOW_DISC && + cmd->fs.ring_cookie >= priv->num_rx_queues) || + cmd->fs.location >= MAX_FILER_IDX) { ret = -EINVAL; break; } |