summary refs log tree commit diff
path: root/pkgs/os-specific/linux/hostapd
diff options
context:
space:
mode:
authorMartin Weinelt <hexa@darmstadt.ccc.de>2020-06-09 14:52:42 +0200
committerMartin Weinelt <hexa@darmstadt.ccc.de>2020-06-09 14:52:42 +0200
commit1c14b52e1837efb226287f9dd115ef8655868506 (patch)
tree8ca53e12c95d65870b44dd876f1843c7371d54ea /pkgs/os-specific/linux/hostapd
parent2c79d7f0c22e79398e67c33054b8d9938b60830e (diff)
downloadnixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.tar
nixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.tar.gz
nixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.tar.bz2
nixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.tar.lz
nixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.tar.xz
nixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.tar.zst
nixpkgs-1c14b52e1837efb226287f9dd115ef8655868506.zip
hostapd: apply patches for CVE-2020-12695
https://w1.fi/security/2020-1/upnp-subscribe-misbehavior-wps-ap.txt

Fixes: CVE-2020-12695
Diffstat (limited to 'pkgs/os-specific/linux/hostapd')
-rw-r--r--pkgs/os-specific/linux/hostapd/default.nix19
1 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/hostapd/default.nix b/pkgs/os-specific/linux/hostapd/default.nix
index 8152655d457..964de0f47b2 100644
--- a/pkgs/os-specific/linux/hostapd/default.nix
+++ b/pkgs/os-specific/linux/hostapd/default.nix
@@ -19,11 +19,30 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/openwrt/openwrt/master/package/network/services/hostapd/patches/300-noscan.patch";
       sha256 = "04wg4yjc19wmwk6gia067z99gzzk9jacnwxh5wyia7k5wg71yj5k";
     })
+    # AP mode PMF disconnection protection bypass (CVE.2019-16275), can be removed >= 2.10
+    # https://w1.fi/security/2019-7/
     (fetchurl {
       name = "CVE-2019-16275.patch";
       url = "https://w1.fi/security/2019-7/0001-AP-Silently-ignore-management-frame-from-unexpected-.patch";
       sha256 = "15xjyy7crb557wxpx898b5lnyblxghlij0xby5lmj9hpwwss34dz";
     })
+    # Fixes for UPnP SUBSCRIBE misbehavior in hostapd WPS AP (CVE-2020-12695), can be removed >= 2.10
+    # https://w1.fi/security/2020-1/
+    (fetchurl {
+      name = "CVE-2020-12695_0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch";
+      url = "https://w1.fi/security/2020-1/0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch";
+      sha256 = "1mrbhicqb34jlw1nid5hk2vnjbvfhvp7r5iblaj4l6vgc6fmp6id";
+    })
+    (fetchurl {
+      name = "CVE-2020-12695_0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch";
+      url = "https://w1.fi/security/2020-1/0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch";
+      sha256 = "1pk08b06b24is50bis3rr56xjd3b5kxdcdk8bx39n9vna9db7zj9";
+    })
+    (fetchurl {
+      name = "CVE-2020-12695_0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch";
+      url = "https://w1.fi/security/2020-1/0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch";
+      sha256 = "12npqp2skgrj934wwkqicgqksma0fxz09di29n1b5fm5i4njl8d8";
+    })
   ];
 
   outputs = [ "out" "man" ];