From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57255) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnQXF-0007Iu-F7 for guix-patches@gnu.org; Wed, 08 Aug 2018 11:38:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnQXC-0007he-Au for guix-patches@gnu.org; Wed, 08 Aug 2018 11:38:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:40226) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fnQXC-0007hK-72 for guix-patches@gnu.org; Wed, 08 Aug 2018 11:38:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1fnQXC-0006G6-0P for guix-patches@gnu.org; Wed, 08 Aug 2018 11:38:02 -0400 Subject: [bug#32402] [PATCH] gnu: wpa_supplicant: Fix CVE-2018-14526. Resent-Message-ID: Received: from eggs.gnu.org ([2001:4830:134:3::10]:57153) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fnQWp-00074A-Qd for guix-patches@gnu.org; Wed, 08 Aug 2018 11:37:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fnQWm-0007LV-Mm for guix-patches@gnu.org; Wed, 08 Aug 2018 11:37:39 -0400 Received: from out1-smtp.messagingengine.com ([66.111.4.25]:45529) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fnQWm-0007KS-G3 for guix-patches@gnu.org; Wed, 08 Aug 2018 11:37:36 -0400 Received: from jasmine.lan (unknown [128.64.129.14]) by mail.messagingengine.com (Postfix) with ESMTPA id 3E692E4116 for ; Wed, 8 Aug 2018 11:37:35 -0400 (EDT) From: Leo Famulari Date: Wed, 8 Aug 2018 11:37:25 -0400 Message-Id: List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: 32402@debbugs.gnu.org I've built all the wpa_supplicant packages but don't have a way to test this change. * gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/admin.scm (wpa-supplicant-minimal)[source]: Use it. --- gnu/local.mk | 1 + gnu/packages/admin.scm | 1 + .../wpa-supplicant-CVE-2018-14526.patch | 53 +++++++++++++++++++ 3 files changed, 55 insertions(+) create mode 100644 gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch diff --git a/gnu/local.mk b/gnu/local.mk index ef28cf032..6fd0d40fb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1213,6 +1213,7 @@ dist_patch_DATA = \ %D%/packages/patches/wordnet-CVE-2008-3908-pt1.patch \ %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch \ %D%/packages/patches/wpa-supplicant-CVE-2017-13082.patch \ + %D%/packages/patches/wpa-supplicant-CVE-2018-14526.patch \ %D%/packages/patches/wpa-supplicant-fix-key-reuse.patch \ %D%/packages/patches/wpa-supplicant-fix-zeroed-keys.patch \ %D%/packages/patches/wpa-supplicant-fix-nonce-reuse.patch \ diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 73772166a..edc1349c4 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1048,6 +1048,7 @@ commands and their arguments.") version ".tar.gz")) (patches (search-patches "wpa-supplicant-CVE-2017-13082.patch" + "wpa-supplicant-CVE-2018-14526.patch" "wpa-supplicant-fix-key-reuse.patch" "wpa-supplicant-fix-zeroed-keys.patch" "wpa-supplicant-fix-nonce-reuse.patch" diff --git a/gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch b/gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch new file mode 100644 index 000000000..d3d5cbc46 --- /dev/null +++ b/gnu/packages/patches/wpa-supplicant-CVE-2018-14526.patch @@ -0,0 +1,53 @@ +Fix CVE-2018-14526: + +https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-14526 +https://w1.fi/security/2018-1/unauthenticated-eapol-key-decryption.txt + +Patch downloaded from upstream: + +https://w1.fi/security/2018-1/rebased-v2.6-0001-WPA-Ignore-unauthenticated-encrypted-EAPOL-Key-data.patch + +From 3e34cfdff6b192fe337c6fb3f487f73e96582961 Mon Sep 17 00:00:00 2001 +From: Mathy Vanhoef +Date: Sun, 15 Jul 2018 01:25:53 +0200 +Subject: [PATCH] WPA: Ignore unauthenticated encrypted EAPOL-Key data + +Ignore unauthenticated encrypted EAPOL-Key data in supplicant +processing. When using WPA2, these are frames that have the Encrypted +flag set, but not the MIC flag. + +When using WPA2, EAPOL-Key frames that had the Encrypted flag set but +not the MIC flag, had their data field decrypted without first verifying +the MIC. In case the data field was encrypted using RC4 (i.e., when +negotiating TKIP as the pairwise cipher), this meant that +unauthenticated but decrypted data would then be processed. An adversary +could abuse this as a decryption oracle to recover sensitive information +in the data field of EAPOL-Key messages (e.g., the group key). +(CVE-2018-14526) + +Signed-off-by: Mathy Vanhoef +--- + src/rsn_supp/wpa.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff -upr wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c wpa_supplicant-2.6/src/rsn_supp/wpa.c +--- wpa_supplicant-2.6.orig/src/rsn_supp/wpa.c 2016-10-02 21:51:11.000000000 +0300 ++++ wpa_supplicant-2.6/src/rsn_supp/wpa.c 2018-08-08 16:55:11.506831029 +0300 +@@ -2016,6 +2016,17 @@ int wpa_sm_rx_eapol(struct wpa_sm *sm, c + + if ((sm->proto == WPA_PROTO_RSN || sm->proto == WPA_PROTO_OSEN) && + (key_info & WPA_KEY_INFO_ENCR_KEY_DATA)) { ++ /* ++ * Only decrypt the Key Data field if the frame's authenticity ++ * was verified. When using AES-SIV (FILS), the MIC flag is not ++ * set, so this check should only be performed if mic_len != 0 ++ * which is the case in this code branch. ++ */ ++ if (!(key_info & WPA_KEY_INFO_MIC)) { ++ wpa_msg(sm->ctx->msg_ctx, MSG_WARNING, ++ "WPA: Ignore EAPOL-Key with encrypted but unauthenticated data"); ++ goto out; ++ } + if (wpa_supplicant_decrypt_key_data(sm, key, ver, key_data, + &key_data_len)) + goto out; -- 2.18.0