lkml.org 
[lkml]   [2014]   [Aug]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 082/137] cfg80211: fix mic_failure tracing
    Date
    3.11.10.15 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Eliad Peller <eliad@wizery.com>

    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: Luis Henriques <luis.henriques@canonical.com>
    ---
    net/wireless/trace.h | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/net/wireless/trace.h b/net/wireless/trace.h
    index e1534baf2ebb..c4d5da718171 100644
    --- a/net/wireless/trace.h
    +++ b/net/wireless/trace.h
    @@ -1994,7 +1994,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,
    --
    1.9.1


    \
     
     \ /
      Last update: 2014-08-18 12:21    [W:4.495 / U:0.340 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site