net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key()

Commit Message

Anant Thazhemadam Oct. 7, 2020, 3:54 a.m. UTC

In nl80211_parse_key(), key.idx is first initialized as -1. 
If this value of key.idx remains unmodified and gets returned, and
nl80211_key_allowed() also returns 0, then rdev_del_key() gets called 
with key.idx = -1.
This causes an out-of-bounds array access.

Handle this issue by checking if the value of key.idx after
nl80211_parse_key() is called and return -EINVAL if key.idx < 0.

Reported-by: [e-mail]
Tested-by: [e-mail]
Signed-off-by: Anant Thazhemadam <[e-mail]>
---
 net/wireless/nl80211.c | 3 +++
 1 file changed, 3 insertions(+)

Comments

[e-mail] Oct. 8, 2020, 8 p.m. UTC | #1

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

On Wed,  7 Oct 2020 09:24:01 +0530 you wrote:
> In nl80211_parse_key(), key.idx is first initialized as -1.
> If this value of key.idx remains unmodified and gets returned, and
> nl80211_key_allowed() also returns 0, then rdev_del_key() gets called
> with key.idx = -1.
> This causes an out-of-bounds array access.
> 
> Handle this issue by checking if the value of key.idx after
> nl80211_parse_key() is called and return -EINVAL if key.idx < 0.
> 
> [...]

Here is the summary with links:
  - net: wireless: nl80211: fix out-of-bounds access in nl80211_del_key()
    https://git.kernel.org/netdev/net/c/3dc289f8f139

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Patch

diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
index 2c9e9a2d1688..7fd45f6ddb05 100644
--- a/net/wireless/nl80211.c
+++ b/net/wireless/nl80211.c
@@ -4172,6 +4172,9 @@  static int nl80211_del_key(struct sk_buff *skb, struct genl_info *info)
 	if (err)
 		return err;
 
+	if (key.idx < 0)
+		return -EINVAL;
+
 	if (info->attrs[NL80211_ATTR_MAC])
 		mac_addr = nla_data(info->attrs[NL80211_ATTR_MAC]);