tjh.dev
bluez: CVE-2018-10910
(cherry picked from commit 7fdb0d28d724998fdabce5868a19bf77c3115974)
authored by
Marek Mahut
and committed by
worldofpeace
638bddf7
b41ca72a
+14
-2
pkgs/os-specific/linux/bluez/default.nix
+14
-2
pkgs/os-specific/linux/bluez/default.nix
···
1
1
{ stdenv, fetchurl, pkgconfig, dbus, glib, alsaLib,
2
-
python3, readline, udev, libical, systemd,
2
+
python3, readline, udev, libical, systemd, fetchpatch,
3
3
enableWiimote ? false, enableMidi ? false, enableSixaxis ? false }:
4
4
5
5
stdenv.mkDerivation rec {
···
23
23
24
24
outputs = [ "out" "dev" "test" ];
25
25
26
-
patches = [ ./bluez-5.37-obexd_without_systemd-1.patch ];
26
+
patches = [
27
+
./bluez-5.37-obexd_without_systemd-1.patch
28
+
(fetchpatch {
29
+
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=1880b299086659844889cdaf687133aca5eaf102";
30
+
name = "CVE-2018-10910-1.patch";
31
+
sha256 = "17spsxza27gif8jpxk7360ynvwii1llfdfwg35rwywjjmvww0qj4";
32
+
})
33
+
(fetchpatch {
34
+
url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=9213ff7642a33aa481e3c61989ad60f7985b9984";
35
+
name = "CVE-2018-10910-2.patch";
36
+
sha256 = "0j7klbhym64yhn86dbsmybqmwx47bviyyhx931izl1p29z2mg8hn";
37
+
})
38
+
];
27
39
28
40
postConfigure = ''
29
41
substituteInPlace tools/hid2hci.rules \