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

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

ixp4xx_eth: Validate hwtstamp_config completely before applying it 



hwtstamp_ioctl() should validate all fields of hwtstamp_config
before making any changes.  Currently it sets the TX configuration
before validating the rx_filter field.

Untested as I don't have a cross-compiler to hand.

Signed-off-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2ee91e54

drivers/net/ethernet/xscale/ixp4xx_eth.c

+3 −9
Original line number Diff line number Diff line
@@ -389,16 +389,8 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
	ch = PORT2CHANNEL(port);

	regs = (struct ixp46x_ts_regs __iomem *) IXP4XX_TIMESYNC_BASE_VIRT;



	switch (cfg.tx_type) {

	case HWTSTAMP_TX_OFF:

		port->hwts_tx_en = 0;

		break;

	case HWTSTAMP_TX_ON:

		port->hwts_tx_en = 1;

		break;

	default:

	if (cfg.tx_type != HWTSTAMP_TX_OFF && cfg.tx_type != HWTSTAMP_TX_ON)

		return -ERANGE;

	}



	switch (cfg.rx_filter) {

	case HWTSTAMP_FILTER_NONE:
@@ -416,6 +408,8 @@ static int hwtstamp_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd) 
		return -ERANGE;

	}



	port->hwts_tx_en = cfg.tx_type == HWTSTAMP_TX_ON;



	/* Clear out any old time stamps. */

	__raw_writel(TX_SNAPSHOT_LOCKED | RX_SNAPSHOT_LOCKED,

		     &regs->channel[ch].ch_event);