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

Commit 3a73e49c authored by Ben Hutchings's avatar Ben Hutchings Committed by David S. Miller
Browse files

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: default avatarBen Hutchings <bhutchings@solarflare.com>
Acked-by: default avatarSebastian Pöhn <sebastian.poehn@googlemail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6386994e

drivers/net/ethernet/freescale/gianfar_ethtool.c

+3 −2
Original line number Diff line number Diff line
@@ -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;

		}