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 16:53:51 -0700 |
| commit | c479a8748ab69398fc0587d9ee575c5d0431cef4 (patch) | |
| tree | 241b4473dc16b4fe4528b9659e3422d1c85f8346 | |
| parent | f0eda5106e9b2adef0f801a57ae7c60b158aed9d (diff) | |
| download | lwn-c479a8748ab69398fc0587d9ee575c5d0431cef4.tar.gz lwn-c479a8748ab69398fc0587d9ee575c5d0431cef4.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 aabccf13e07b..0a46eba04a4a 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -2072,7 +2072,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, |