diff options
| author | Eliad Peller <eliad@wizery.com> | 2014-07-17 15:00:56 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-08-07 14:30:25 -0700 |
| commit | 201c26e77bfc4064afc6a630fc336a825047be7b (patch) | |
| tree | 11f4e091bbabbd260e196eaf8ec433ae3f0dd88d | |
| parent | c3056d9f28d86c4f0091e7843d38e4584b51128b (diff) | |
| download | linux-3.10-201c26e77bfc4064afc6a630fc336a825047be7b.tar.gz linux-3.10-201c26e77bfc4064afc6a630fc336a825047be7b.tar.bz2 linux-3.10-201c26e77bfc4064afc6a630fc336a825047be7b.zip | |
cfg80211: fix mic_failure tracing
commit 8c26d458394be44e135d1c6bd4557e1c4e1a0535 upstream.
tsc can be NULL (mac80211 currently always passes NULL),
resulting in NULL-dereference. check before copying it.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | net/wireless/trace.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 5755bc14abb..bc5a75b1aef 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -1972,7 +1972,8 @@ TRACE_EVENT(cfg80211_michael_mic_failure, MAC_ASSIGN(addr, addr); __entry->key_type = key_type; __entry->key_id = key_id; - memcpy(__entry->tsc, tsc, 6); + if (tsc) + memcpy(__entry->tsc, tsc, 6); ), TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm", NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->key_type, |