Commit 8c26d458 authored by Eliad Peller's avatar Eliad Peller Committed by Johannes Berg

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: default avatarEliad Peller <eliadx.peller@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 08b99399
...@@ -2094,6 +2094,7 @@ TRACE_EVENT(cfg80211_michael_mic_failure, ...@@ -2094,6 +2094,7 @@ TRACE_EVENT(cfg80211_michael_mic_failure,
MAC_ASSIGN(addr, addr); MAC_ASSIGN(addr, addr);
__entry->key_type = key_type; __entry->key_type = key_type;
__entry->key_id = key_id; __entry->key_id = key_id;
if (tsc)
memcpy(__entry->tsc, tsc, 6); memcpy(__entry->tsc, tsc, 6);
), ),
TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm", TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment