rt2x00: Validate MCS on RX path (3590eea4) · Commits · 戴 / test

drivers/net/wireless/rt2x00/rt2x00dev.c

+37 −35

Original line number	Diff line number	Diff line
		@@ -432,24 +432,22 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
		struct ieee80211_supported_band *sband;
		const struct rt2x00_rate *rate;
		unsigned int i;
		int signal;
		int type;
		int signal = rxdesc->signal;
		int type = (rxdesc->dev_flags & RXDONE_SIGNAL_MASK);

		switch (rxdesc->rate_mode) {
		case RATE_MODE_CCK:
		case RATE_MODE_OFDM:
		/*
		* For non-HT rates the MCS value needs to contain the
		* actually used rate modulation (CCK or OFDM).
		*/
		if (rxdesc->dev_flags & RXDONE_SIGNAL_MCS)
		signal = RATE_MCS(rxdesc->rate_mode, rxdesc->signal);
		else
		signal = rxdesc->signal;

		type = (rxdesc->dev_flags & RXDONE_SIGNAL_MASK);
		signal = RATE_MCS(rxdesc->rate_mode, signal);

		sband = &rt2x00dev->bands[rt2x00dev->curr_band];
		for (i = 0; i < sband->n_bitrates; i++) {
		rate = rt2x00_get_rate(sband->bitrates[i].hw_value);

		if (((type == RXDONE_SIGNAL_PLCP) &&
		(rate->plcp == signal)) \|\|
		((type == RXDONE_SIGNAL_BITRATE) &&
		@@ -459,9 +457,19 @@ static int rt2x00lib_rxdone_read_signal(struct rt2x00_dev *rt2x00dev,
		return i;
		}
		}
		break;
		case RATE_MODE_HT_MIX:
		case RATE_MODE_HT_GREENFIELD:
		if (signal >= 0 && signal <= 76)
		return signal;
		break;
		default:
		break;
		}

		WARNING(rt2x00dev, "Frame received with unrecognized signal, "
		"signal=0x%.4x, type=%d.\n", signal, type);
		"mode=0x%.4x, signal=0x%.4x, type=%d.\n",
		rxdesc->rate_mode, signal, type);
		return 0;
		}

		@@ -523,18 +531,12 @@ void rt2x00lib_rxdone(struct queue_entry *entry)
		skb_trim(entry->skb, rxdesc.size);

		/*
		* Check if the frame was received using HT. In that case,
		* the rate is the MCS index and should be passed to mac80211
		* directly. Otherwise we need to translate the signal to
		* the correct bitrate index.
		* Translate the signal to the correct bitrate index.
		*/
		if (rxdesc.rate_mode == RATE_MODE_CCK \|\|
		rxdesc.rate_mode == RATE_MODE_OFDM) {
		rate_idx = rt2x00lib_rxdone_read_signal(rt2x00dev, &rxdesc);
		} else {
		if (rxdesc.rate_mode == RATE_MODE_HT_MIX \|\|
		rxdesc.rate_mode == RATE_MODE_HT_GREENFIELD)
		rxdesc.flags \|= RX_FLAG_HT;
		rate_idx = rxdesc.signal;
		}

		/*
		* Update extra components

Admin message