Commit 55cb0797 authored by John W. Linville's avatar John W. Linville
Browse files

Merge tag 'nfc-fixes-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-3.0 

This is an NFC LLCP fix for 3.7 and contains only one patch.

It fixes a potential crash when receiving an LLCP HDLC frame acking a frame
that is not the last sent one. In that case we may dereference an already
freed pointer.
parents 795e9364 28981491

drivers/net/wireless/iwlwifi/dvm/rxon.c

+6 −6
Original line number Diff line number Diff line
@@ -1012,12 +1012,12 @@ static void iwl_calc_basic_rates(struct iwl_priv *priv, 
	 * As a consequence, it's not as complicated as it sounds, just add

	 * any lower rates to the ACK rate bitmap.

	 */

	if (IWL_RATE_11M_INDEX < lowest_present_ofdm)

		ofdm |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_5M_INDEX < lowest_present_ofdm)

		ofdm |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_2M_INDEX < lowest_present_ofdm)

		ofdm |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_11M_INDEX < lowest_present_cck)

		cck |= IWL_RATE_11M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_5M_INDEX < lowest_present_cck)

		cck |= IWL_RATE_5M_MASK >> IWL_FIRST_CCK_RATE;

	if (IWL_RATE_2M_INDEX < lowest_present_cck)

		cck |= IWL_RATE_2M_MASK >> IWL_FIRST_CCK_RATE;

	/* 1M already there or needed so always add */

	cck |= IWL_RATE_1M_MASK >> IWL_FIRST_CCK_RATE;

net/mac80211/offchannel.c

+0 −2
Original line number Diff line number Diff line
@@ -462,8 +462,6 @@ void ieee80211_roc_purge(struct ieee80211_sub_if_data *sdata) 
		list_move_tail(&roc->list, &tmp_list);

		roc->abort = true;

	}



	ieee80211_start_next_roc(local);

	mutex_unlock(&local->mtx);



	list_for_each_entry_safe(roc, tmp, &tmp_list, list) {

net/nfc/llcp/llcp.c

+4 −1
Original line number Diff line number Diff line
@@ -985,15 +985,18 @@ static void nfc_llcp_recv_hdlc(struct nfc_llcp_local *local, 
	/* Remove skbs from the pending queue */

	if (llcp_sock->send_ack_n != nr) {

		struct sk_buff *s, *tmp;

		u8 n;



		llcp_sock->send_ack_n = nr;



		/* Remove and free all skbs until ns == nr */

		skb_queue_walk_safe(&llcp_sock->tx_pending_queue, s, tmp) {

			n = nfc_llcp_ns(s);



			skb_unlink(s, &llcp_sock->tx_pending_queue);

			kfree_skb(s);



			if (nfc_llcp_ns(s) == nr)

			if (n == nr)

				break;

		}