mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2024-07-08 20:31:57 +00:00
44 lines
1.6 KiB
Diff
44 lines
1.6 KiB
Diff
From 082d8a6a55d2b6583d9e93ac9796efdf4c412658 Mon Sep 17 00:00:00 2001
|
|
From: Vladis Dronov <vdronov@redhat.com>
|
|
Date: Wed, 13 Sep 2017 00:21:21 +0200
|
|
Subject: nl80211: check for the required netlink attributes presence
|
|
|
|
commit e785fa0a164aa11001cba931367c7f94ffaff888 upstream.
|
|
|
|
nl80211_set_rekey_data() does not check if the required attributes
|
|
NL80211_REKEY_DATA_{REPLAY_CTR,KEK,KCK} are present when processing
|
|
NL80211_CMD_SET_REKEY_OFFLOAD request. This request can be issued by
|
|
users with CAP_NET_ADMIN privilege and may result in NULL dereference
|
|
and a system crash. Add a check for the required attributes presence.
|
|
This patch is based on the patch by bo Zhang.
|
|
|
|
This fixes CVE-2017-12153.
|
|
|
|
References: https://bugzilla.redhat.com/show_bug.cgi?id=1491046
|
|
Fixes: e5497d766ad ("cfg80211/nl80211: support GTK rekey offload")
|
|
Reported-by: bo Zhang <zhangbo5891001@gmail.com>
|
|
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
|
|
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
|
|
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
|
|
---
|
|
net/wireless/nl80211.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c
|
|
index 19a3c87..41a0ebb 100644
|
|
--- a/net/wireless/nl80211.c
|
|
+++ b/net/wireless/nl80211.c
|
|
@@ -5823,6 +5823,9 @@ static int nl80211_set_rekey_data(struct sk_buff *skb, struct genl_info *info)
|
|
if (err)
|
|
return err;
|
|
|
|
+ if (!tb[NL80211_REKEY_DATA_REPLAY_CTR] || !tb[NL80211_REKEY_DATA_KEK] ||
|
|
+ !tb[NL80211_REKEY_DATA_KCK])
|
|
+ return -EINVAL;
|
|
if (nla_len(tb[NL80211_REKEY_DATA_REPLAY_CTR]) != NL80211_REPLAY_CTR_LEN)
|
|
return -ERANGE;
|
|
if (nla_len(tb[NL80211_REKEY_DATA_KEK]) != NL80211_KEK_LEN)
|
|
--
|
|
cgit v1.1
|
|
|