| From aec828e54420e019caf0c65f3d69dd075992f0b8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 24 Sep 2018 18:10:22 +0200 |
| Subject: nl80211: Fix a GET_KEY reply attribute |
| |
| From: Andrew Zaborowski <andrew.zaborowski@intel.com> |
| |
| [ 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> |
| --- |
| net/wireless/nl80211.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c |
| index 9627c52c3f937..df8c5312f26ad 100644 |
| --- a/net/wireless/nl80211.c |
| +++ b/net/wireless/nl80211.c |
| @@ -3118,7 +3118,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); |
| -- |
| 2.20.1 |
| |
