summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b362167)
raw | patch | inline | side by side (parent: b362167)
author | Eliad Peller <eliad@wizery.com> | |
Thu, 17 Jul 2014 12:00:56 +0000 (15:00 +0300) | ||
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
Thu, 7 Aug 2014 21:52:36 +0000 (14:52 -0700) |
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>
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>
net/wireless/trace.h | patch | blob | history |
diff --git a/net/wireless/trace.h b/net/wireless/trace.h
index fbcc23edee5474459950b8566ecffd541ad4ed7d..b89eb3990f0a7e7282c9aca31c640ce44e17e612 100644 (file)
--- a/net/wireless/trace.h
+++ b/net/wireless/trace.h
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,