From: Vladis Dronov Date: Tue, 12 Sep 2017 22:21:21 +0000 (+0200) Subject: nl80211: check for the required netlink attributes presence X-Git-Tag: v4.1.12-124.31.3~293 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=f7b49d15cf9bdf2a312c37f2371bfb949ba6e036;p=users%2Fjedix%2Flinux-maple.git nl80211: check for the required netlink attributes presence 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") Cc: # v3.1-rc1 Reported-by: bo Zhang Signed-off-by: Vladis Dronov Signed-off-by: Johannes Berg (cherry picked from commit e785fa0a164aa11001cba931367c7f94ffaff888) Orabug: 29245533 CVE: CVE-2017-12153 Reviewed-by: Darren Kenny Signed-off-by: Allen Pais Signed-off-by: Brian Maly --- diff --git a/net/wireless/nl80211.c b/net/wireless/nl80211.c index f24138681b80..2f0da5003fc5 100644 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c @@ -9601,6 +9601,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)