Commit 8c26d458 authored Jul 17, 2014 by Eliad Peller Committed by Johannes Berg Jul 18, 2014

cfg80211: fix mic_failure tracing



tsc can be NULL (mac80211 currently always passes NULL),
resulting in NULL-dereference. check before copying it.

Cc: stable@vger.kernel.org
Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>

parent 08b99399

net/wireless/trace.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -2094,6 +2094,7 @@ TRACE_EVENT(cfg80211_michael_mic_failure,
		MAC_ASSIGN(addr, addr);
		__entry->key_type = key_type;
		__entry->key_id = key_id;
		if (tsc)
		memcpy(__entry->tsc, tsc, 6);
		),
		TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",