mac80211: Fix null dereference in ieee80211_key_link()
authorBen Hutchings <ben@decadent.org.uk>
Wed, 22 Nov 2017 02:04:29 +0000 (02:04 +0000)
committerBen Hutchings <ben@decadent.org.uk>
Sun, 26 Nov 2017 13:51:11 +0000 (13:51 +0000)
commit2c0a646da94d4e334e4070286e0361f91cd4f016
tree5257d4782753e1ac055cb5cf7020b97430a7c8e7
parent3599fa6eb4415945063710c7be20c74ce6f2e3b4
mac80211: Fix null dereference in ieee80211_key_link()

Commit ef810e7c3d2a ("mac80211: accept key reinstall without changing
anything") moved the initialisation of key->sdata later in
ieee80211_key_link().  In the upstream commit fdf7cb4185b6 this was
fine, but in this version of the function there is additional code
which relies on key->sdata.  Change this to use the value that will be
(conditionally) assigned to it later.

Cc: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
net/mac80211/key.c