releases/3.14.16/cfg80211-fix-mic_failure-tracing.patch

   1 From 8c26d458394be44e135d1c6bd4557e1c4e1a0535 Mon Sep 17 00:00:00 2001
   2 From: Eliad Peller <eliad@wizery.com>
   3 Date: Thu, 17 Jul 2014 15:00:56 +0300
   4 Subject: cfg80211: fix mic_failure tracing
   5
   6 From: Eliad Peller <eliad@wizery.com>
   7
   8 commit 8c26d458394be44e135d1c6bd4557e1c4e1a0535 upstream.
   9
  10 tsc can be NULL (mac80211 currently always passes NULL),
  11 resulting in NULL-dereference. check before copying it.
  12
  13 Signed-off-by: Eliad Peller <eliadx.peller@intel.com>
  14 Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
  15 Signed-off-by: Johannes Berg <johannes.berg@intel.com>
  16 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  17
  18 ---
  19  net/wireless/trace.h |    3 ++-
  20  1 file changed, 2 insertions(+), 1 deletion(-)
  21
  22 --- a/net/wireless/trace.h
  23 +++ b/net/wireless/trace.h
  24 @@ -2068,7 +2068,8 @@ TRACE_EVENT(cfg80211_michael_mic_failure
  25                 MAC_ASSIGN(addr, addr);
  26                 __entry->key_type = key_type;
  27                 __entry->key_id = key_id;
  28 -               memcpy(__entry->tsc, tsc, 6);
  29 +               if (tsc)
  30 +                       memcpy(__entry->tsc, tsc, 6);
  31         ),
  32         TP_printk(NETDEV_PR_FMT ", " MAC_PR_FMT ", key type: %d, key id: %d, tsc: %pm",
  33                   NETDEV_PR_ARG, MAC_PR_ARG(addr), __entry->key_type,