summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorAndrew Zaborowski <andrew.zaborowski@intel.com>2018-09-24 18:10:22 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-11-24 08:19:39 +0100
commitbe4f5457a5fde737000efd278b3c8b2ae6bda732 (patch)
treed0468ea70479ac87f5a8a1b812a073eabbd7c9aa /net
parent21ba66937e0d08d9dbf08cd21e891665e502fc13 (diff)
downloadlinux-stable-be4f5457a5fde737000efd278b3c8b2ae6bda732.tar.gz
linux-stable-be4f5457a5fde737000efd278b3c8b2ae6bda732.tar.bz2
linux-stable-be4f5457a5fde737000efd278b3c8b2ae6bda732.zip
nl80211: Fix a GET_KEY reply attribute
[ Upstream commit efdfce7270de85a8706d1ea051bef3a7486809ff ] Use the NL80211_KEY_IDX attribute inside the NL80211_ATTR_KEY in NL80211_CMD_GET_KEY responses to comply with nl80211_key_policy. This is unlikely to affect existing userspace. Signed-off-by: Andrew Zaborowski <andrew.zaborowski@intel.com> Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'net')
-rw-r--r--net/wireless/nl80211.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 2ef1f56504cb..5075fd293feb 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -3396,7 +3396,7 @@ static void get_key_callback(void *c, struct key_params *params)
params->cipher)))
goto nla_put_failure;
- if (nla_put_u8(cookie->msg, NL80211_ATTR_KEY_IDX, cookie->idx))
+ if (nla_put_u8(cookie->msg, NL80211_KEY_IDX, cookie->idx))
goto nla_put_failure;
nla_nest_end(cookie->msg, key);