From: Johannes Berg Date: Tue, 19 Mar 2013 19:26:57 +0000 (+0100) Subject: cfg80211: fix wdev tracing crash X-Git-Tag: MMI-PSA29.97-13-9~14628^2~11^2^2~1^2~8 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce1eadda6badef9e4e3460097ede674fca47383d;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git cfg80211: fix wdev tracing crash Arend reported a crash in tracing if the driver returns an ERR_PTR() value from the add_virtual_intf() callback. This is due to the tracing then still attempting to dereference the "pointer", fix this by using IS_ERR_OR_NULL(). Reported-by: Arend van Spriel Tested-by: Arend van Spriel Signed-off-by: Johannes Berg --- diff --git a/net/wireless/trace.h b/net/wireless/trace.h index 6847d043edea..7586de77a2f8 100644 --- a/net/wireless/trace.h +++ b/net/wireless/trace.h @@ -27,7 +27,8 @@ #define WIPHY_PR_ARG __entry->wiphy_name #define WDEV_ENTRY __field(u32, id) -#define WDEV_ASSIGN (__entry->id) = (wdev ? wdev->identifier : 0) +#define WDEV_ASSIGN (__entry->id) = (!IS_ERR_OR_NULL(wdev) \ + ? wdev->identifier : 0) #define WDEV_PR_FMT "wdev(%u)" #define WDEV_PR_ARG (__entry->id)