openeuler-ci-bot
Gitee
commit
1f8a6b96af
31
CVE-2020-0556-1.patch
Normal file
31
CVE-2020-0556-1.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From 6e47f991fa00fb069f22fe0ef4779fd85dc0f540 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alain Michaud <alainm@chromium.org>
|
||||||
|
Date: Tue, 10 Mar 2020 02:35:16 +0000
|
||||||
|
Subject: [PATCH 1/4] HOGP must only accept data from bonded devices.
|
||||||
|
|
||||||
|
HOGP 1.0 Section 6.1 establishes that the HOGP must require bonding.
|
||||||
|
|
||||||
|
Reference:
|
||||||
|
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.htm
|
||||||
|
---
|
||||||
|
profiles/input/hog.c | 4 ++++
|
||||||
|
1 file changed, 4 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
|
||||||
|
index 23c9c15..f8a82bc 100644
|
||||||
|
--- a/profiles/input/hog.c
|
||||||
|
+++ b/profiles/input/hog.c
|
||||||
|
@@ -186,6 +186,10 @@ static int hog_accept(struct btd_service *service)
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
+ /* HOGP 1.0 Section 6.1 requires bonding */
|
||||||
|
+ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device)))
|
||||||
|
+ return -ECONNREFUSED;
|
||||||
|
+
|
||||||
|
/* TODO: Replace GAttrib with bt_gatt_client */
|
||||||
|
bt_hog_attach(dev->hog, attrib);
|
||||||
|
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
138
CVE-2020-0556-2.patch
Normal file
138
CVE-2020-0556-2.patch
Normal file
@ -0,0 +1,138 @@
|
|||||||
|
From e16c6d3b62d0d7d5885255cf9cef686a2415330d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alain Michaud <alainm@chromium.org>
|
||||||
|
Date: Tue, 10 Mar 2020 02:35:18 +0000
|
||||||
|
Subject: [PATCH 2/4] HID accepts bonded device connections only.
|
||||||
|
|
||||||
|
This change adds a configuration for platforms to choose a more secure
|
||||||
|
posture for the HID profile. While some older mice are known to not
|
||||||
|
support pairing or encryption, some platform may choose a more secure
|
||||||
|
posture by requiring the device to be bonded and require the
|
||||||
|
connection to be encrypted when bonding is required.
|
||||||
|
|
||||||
|
Reference:
|
||||||
|
https://www.intel.com/content/www/us/en/security-center/advisory/intel-sa-00352.html
|
||||||
|
---
|
||||||
|
profiles/input/device.c | 23 ++++++++++++++++++++++-
|
||||||
|
profiles/input/device.h | 1 +
|
||||||
|
profiles/input/input.conf | 8 ++++++++
|
||||||
|
profiles/input/manager.c | 13 ++++++++++++-
|
||||||
|
4 files changed, 43 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/profiles/input/device.c b/profiles/input/device.c
|
||||||
|
index 8461478..3abd2f5 100644
|
||||||
|
--- a/profiles/input/device.c
|
||||||
|
+++ b/profiles/input/device.c
|
||||||
|
@@ -91,6 +91,7 @@ struct input_device {
|
||||||
|
|
||||||
|
static int idle_timeout = 0;
|
||||||
|
static bool uhid_enabled = false;
|
||||||
|
+static bool classic_bonded_only = false;
|
||||||
|
|
||||||
|
void input_set_idle_timeout(int timeout)
|
||||||
|
{
|
||||||
|
@@ -102,6 +103,11 @@ void input_enable_userspace_hid(bool state)
|
||||||
|
uhid_enabled = state;
|
||||||
|
}
|
||||||
|
|
||||||
|
+void input_set_classic_bonded_only(bool state)
|
||||||
|
+{
|
||||||
|
+ classic_bonded_only = state;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void input_device_enter_reconnect_mode(struct input_device *idev);
|
||||||
|
static int connection_disconnect(struct input_device *idev, uint32_t flags);
|
||||||
|
|
||||||
|
@@ -969,8 +975,18 @@ static int hidp_add_connection(struct input_device *idev)
|
||||||
|
if (device_name_known(idev->device))
|
||||||
|
device_get_name(idev->device, req->name, sizeof(req->name));
|
||||||
|
|
||||||
|
+ /* Make sure the device is bonded if required */
|
||||||
|
+ if (classic_bonded_only && !device_is_bonded(idev->device,
|
||||||
|
+ btd_device_get_bdaddr_type(idev->device))) {
|
||||||
|
+ error("Rejected connection from !bonded device %s", dst_addr);
|
||||||
|
+ goto cleanup;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
/* Encryption is mandatory for keyboards */
|
||||||
|
- if (req->subclass & 0x40) {
|
||||||
|
+ /* Some platforms may choose to require encryption for all devices */
|
||||||
|
+ /* Note that this only matters for pre 2.1 devices as otherwise the */
|
||||||
|
+ /* device is encrypted by default by the lower layers */
|
||||||
|
+ if (classic_bonded_only || req->subclass & 0x40) {
|
||||||
|
if (!bt_io_set(idev->intr_io, &gerr,
|
||||||
|
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
|
||||||
|
BT_IO_OPT_INVALID)) {
|
||||||
|
@@ -1202,6 +1218,11 @@ static void input_device_enter_reconnect_mode(struct input_device *idev)
|
||||||
|
DBG("path=%s reconnect_mode=%s", idev->path,
|
||||||
|
reconnect_mode_to_string(idev->reconnect_mode));
|
||||||
|
|
||||||
|
+ /* Make sure the device is bonded if required */
|
||||||
|
+ if (classic_bonded_only && !device_is_bonded(idev->device,
|
||||||
|
+ btd_device_get_bdaddr_type(idev->device)))
|
||||||
|
+ return;
|
||||||
|
+
|
||||||
|
/* Only attempt an auto-reconnect when the device is required to
|
||||||
|
* accept reconnections from the host.
|
||||||
|
*/
|
||||||
|
diff --git a/profiles/input/device.h b/profiles/input/device.h
|
||||||
|
index 51a9aee..3044db6 100644
|
||||||
|
--- a/profiles/input/device.h
|
||||||
|
+++ b/profiles/input/device.h
|
||||||
|
@@ -29,6 +29,7 @@ struct input_conn;
|
||||||
|
|
||||||
|
void input_set_idle_timeout(int timeout);
|
||||||
|
void input_enable_userspace_hid(bool state);
|
||||||
|
+void input_set_classic_bonded_only(bool state);
|
||||||
|
|
||||||
|
int input_device_register(struct btd_service *service);
|
||||||
|
void input_device_unregister(struct btd_service *service);
|
||||||
|
diff --git a/profiles/input/input.conf b/profiles/input/input.conf
|
||||||
|
index 3e1d65a..166aff4 100644
|
||||||
|
--- a/profiles/input/input.conf
|
||||||
|
+++ b/profiles/input/input.conf
|
||||||
|
@@ -11,3 +11,11 @@
|
||||||
|
# Enable HID protocol handling in userspace input profile
|
||||||
|
# Defaults to false (HIDP handled in HIDP kernel module)
|
||||||
|
#UserspaceHID=true
|
||||||
|
+
|
||||||
|
+# Limit HID connections to bonded devices
|
||||||
|
+# The HID Profile does not specify that devices must be bonded, however some
|
||||||
|
+# platforms may want to make sure that input connections only come from bonded
|
||||||
|
+# device connections. Several older mice have been known for not supporting
|
||||||
|
+# pairing/encryption.
|
||||||
|
+# Defaults to false to maximize device compatibility.
|
||||||
|
+#ClassicBondedOnly=true
|
||||||
|
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
|
||||||
|
index 1d31b06..5cd27b8 100644
|
||||||
|
--- a/profiles/input/manager.c
|
||||||
|
+++ b/profiles/input/manager.c
|
||||||
|
@@ -96,7 +96,7 @@ static int input_init(void)
|
||||||
|
config = load_config_file(CONFIGDIR "/input.conf");
|
||||||
|
if (config) {
|
||||||
|
int idle_timeout;
|
||||||
|
- gboolean uhid_enabled;
|
||||||
|
+ gboolean uhid_enabled, classic_bonded_only;
|
||||||
|
|
||||||
|
idle_timeout = g_key_file_get_integer(config, "General",
|
||||||
|
"IdleTimeout", &err);
|
||||||
|
@@ -114,6 +114,17 @@ static int input_init(void)
|
||||||
|
input_enable_userspace_hid(uhid_enabled);
|
||||||
|
} else
|
||||||
|
g_clear_error(&err);
|
||||||
|
+
|
||||||
|
+ classic_bonded_only = g_key_file_get_boolean(config, "General",
|
||||||
|
+ "ClassicBondedOnly", &err);
|
||||||
|
+
|
||||||
|
+ if (!err) {
|
||||||
|
+ DBG("input.conf: ClassicBondedOnly=%s",
|
||||||
|
+ classic_bonded_only ? "true" : "false");
|
||||||
|
+ input_set_classic_bonded_only(classic_bonded_only);
|
||||||
|
+ } else
|
||||||
|
+ g_clear_error(&err);
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
btd_profile_register(&input_profile);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
48
CVE-2020-0556-3.patch
Normal file
48
CVE-2020-0556-3.patch
Normal file
@ -0,0 +1,48 @@
|
|||||||
|
From dbb346f3606d07005a162e093b616519b337c5f0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||||||
|
Date: Tue, 10 Mar 2020 09:59:07 -0700
|
||||||
|
Subject: [PATCH 3/4] input: hog: Attempt to set security level if not bonded
|
||||||
|
|
||||||
|
This attempts to set the security if the device is not bonded, the
|
||||||
|
kernel will block any communication on the ATT socket while bumping
|
||||||
|
the security and if that fails the device will be disconnected which
|
||||||
|
is better than having the device dangling around without being able to
|
||||||
|
communicate with it until it is properly bonded.
|
||||||
|
---
|
||||||
|
profiles/input/hog.c | 13 +++++++++++--
|
||||||
|
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
|
||||||
|
index f8a82bc..e0e9df2 100644
|
||||||
|
--- a/profiles/input/hog.c
|
||||||
|
+++ b/profiles/input/hog.c
|
||||||
|
@@ -49,6 +49,8 @@
|
||||||
|
#include "src/shared/util.h"
|
||||||
|
#include "src/shared/uhid.h"
|
||||||
|
#include "src/shared/queue.h"
|
||||||
|
+#include "src/shared/att.h"
|
||||||
|
+#include "src/shared/gatt-client.h"
|
||||||
|
#include "src/plugin.h"
|
||||||
|
|
||||||
|
#include "suspend.h"
|
||||||
|
@@ -187,8 +189,15 @@ static int hog_accept(struct btd_service *service)
|
||||||
|
}
|
||||||
|
|
||||||
|
/* HOGP 1.0 Section 6.1 requires bonding */
|
||||||
|
- if (!device_is_bonded(device, btd_device_get_bdaddr_type(device)))
|
||||||
|
- return -ECONNREFUSED;
|
||||||
|
+ if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) {
|
||||||
|
+ struct bt_gatt_client *client;
|
||||||
|
+
|
||||||
|
+ client = btd_device_get_gatt_client(device);
|
||||||
|
+ if (!bt_gatt_client_set_security(client,
|
||||||
|
+ BT_ATT_SECURITY_MEDIUM)) {
|
||||||
|
+ return -ECONNREFUSED;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
|
||||||
|
/* TODO: Replace GAttrib with bt_gatt_client */
|
||||||
|
bt_hog_attach(dev->hog, attrib);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
121
CVE-2020-0556-4.patch
Normal file
121
CVE-2020-0556-4.patch
Normal file
@ -0,0 +1,121 @@
|
|||||||
|
From 304843c6f5e4d7a5a588cce7a41b2819324fc1b0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
||||||
|
Date: Wed, 11 Mar 2020 11:43:21 -0700
|
||||||
|
Subject: [PATCH 4/4] input: Add LEAutoSecurity setting to input.conf
|
||||||
|
|
||||||
|
LEAutoSecurity can be used to enable/disable automatic upgrades of
|
||||||
|
security for LE devices, by default it is enabled so existing devices
|
||||||
|
that did not require security and were not bonded will automatically
|
||||||
|
upgrade the security.
|
||||||
|
|
||||||
|
Note: Platforms disabling this setting would require users to manually
|
||||||
|
bond the device which may require changes to the user interface to
|
||||||
|
always force bonding for input devices as APIs such as Device.Connect
|
||||||
|
will no longer work which maybe perceived as a regression.
|
||||||
|
---
|
||||||
|
profiles/input/device.h | 1 +
|
||||||
|
profiles/input/hog.c | 13 +++++++++++--
|
||||||
|
profiles/input/input.conf | 5 +++++
|
||||||
|
profiles/input/manager.c | 11 ++++++++++-
|
||||||
|
4 files changed, 27 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/profiles/input/device.h b/profiles/input/device.h
|
||||||
|
index 3044db6..5a077f9 100644
|
||||||
|
--- a/profiles/input/device.h
|
||||||
|
+++ b/profiles/input/device.h
|
||||||
|
@@ -30,6 +30,7 @@ struct input_conn;
|
||||||
|
void input_set_idle_timeout(int timeout);
|
||||||
|
void input_enable_userspace_hid(bool state);
|
||||||
|
void input_set_classic_bonded_only(bool state);
|
||||||
|
+void input_set_auto_sec(bool state);
|
||||||
|
|
||||||
|
int input_device_register(struct btd_service *service);
|
||||||
|
void input_device_unregister(struct btd_service *service);
|
||||||
|
diff --git a/profiles/input/hog.c b/profiles/input/hog.c
|
||||||
|
index e0e9df2..4714e1e 100644
|
||||||
|
--- a/profiles/input/hog.c
|
||||||
|
+++ b/profiles/input/hog.c
|
||||||
|
@@ -53,6 +53,7 @@
|
||||||
|
#include "src/shared/gatt-client.h"
|
||||||
|
#include "src/plugin.h"
|
||||||
|
|
||||||
|
+#include "device.h"
|
||||||
|
#include "suspend.h"
|
||||||
|
#include "attrib/att.h"
|
||||||
|
#include "attrib/gattrib.h"
|
||||||
|
@@ -67,8 +68,14 @@ struct hog_device {
|
||||||
|
};
|
||||||
|
|
||||||
|
static gboolean suspend_supported = FALSE;
|
||||||
|
+static bool auto_sec = true;
|
||||||
|
static struct queue *devices = NULL;
|
||||||
|
|
||||||
|
+void input_set_auto_sec(bool state)
|
||||||
|
+{
|
||||||
|
+ auto_sec = state;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static void hog_device_accept(struct hog_device *dev, struct gatt_db *db)
|
||||||
|
{
|
||||||
|
char name[248];
|
||||||
|
@@ -192,11 +199,13 @@ static int hog_accept(struct btd_service *service)
|
||||||
|
if (!device_is_bonded(device, btd_device_get_bdaddr_type(device))) {
|
||||||
|
struct bt_gatt_client *client;
|
||||||
|
|
||||||
|
+ if (!auto_sec)
|
||||||
|
+ return -ECONNREFUSED;
|
||||||
|
+
|
||||||
|
client = btd_device_get_gatt_client(device);
|
||||||
|
if (!bt_gatt_client_set_security(client,
|
||||||
|
- BT_ATT_SECURITY_MEDIUM)) {
|
||||||
|
+ BT_ATT_SECURITY_MEDIUM))
|
||||||
|
return -ECONNREFUSED;
|
||||||
|
- }
|
||||||
|
}
|
||||||
|
|
||||||
|
/* TODO: Replace GAttrib with bt_gatt_client */
|
||||||
|
diff --git a/profiles/input/input.conf b/profiles/input/input.conf
|
||||||
|
index 166aff4..4c70bc5 100644
|
||||||
|
--- a/profiles/input/input.conf
|
||||||
|
+++ b/profiles/input/input.conf
|
||||||
|
@@ -19,3 +19,8 @@
|
||||||
|
# pairing/encryption.
|
||||||
|
# Defaults to false to maximize device compatibility.
|
||||||
|
#ClassicBondedOnly=true
|
||||||
|
+
|
||||||
|
+# LE upgrade security
|
||||||
|
+# Enables upgrades of security automatically if required.
|
||||||
|
+# Defaults to true to maximize device compatibility.
|
||||||
|
+#LEAutoSecurity=true
|
||||||
|
diff --git a/profiles/input/manager.c b/profiles/input/manager.c
|
||||||
|
index 5cd27b8..bf4acb4 100644
|
||||||
|
--- a/profiles/input/manager.c
|
||||||
|
+++ b/profiles/input/manager.c
|
||||||
|
@@ -96,7 +96,7 @@ static int input_init(void)
|
||||||
|
config = load_config_file(CONFIGDIR "/input.conf");
|
||||||
|
if (config) {
|
||||||
|
int idle_timeout;
|
||||||
|
- gboolean uhid_enabled, classic_bonded_only;
|
||||||
|
+ gboolean uhid_enabled, classic_bonded_only, auto_sec;
|
||||||
|
|
||||||
|
idle_timeout = g_key_file_get_integer(config, "General",
|
||||||
|
"IdleTimeout", &err);
|
||||||
|
@@ -125,6 +125,15 @@ static int input_init(void)
|
||||||
|
} else
|
||||||
|
g_clear_error(&err);
|
||||||
|
|
||||||
|
+ auto_sec = g_key_file_get_boolean(config, "General",
|
||||||
|
+ "LEAutoSecurity", &err);
|
||||||
|
+ if (!err) {
|
||||||
|
+ DBG("input.conf: LEAutoSecurity=%s",
|
||||||
|
+ auto_sec ? "true" : "false");
|
||||||
|
+ input_set_auto_sec(auto_sec);
|
||||||
|
+ } else
|
||||||
|
+ g_clear_error(&err);
|
||||||
|
+
|
||||||
|
}
|
||||||
|
|
||||||
|
btd_profile_register(&input_profile);
|
||||||
|
--
|
||||||
|
1.8.3.1
|
||||||
|
|
||||||
13
bluez.spec
13
bluez.spec
@ -1,7 +1,7 @@
|
|||||||
Name: bluez
|
Name: bluez
|
||||||
Summary: Bluetooth utilities
|
Summary: Bluetooth utilities
|
||||||
Version: 5.50
|
Version: 5.50
|
||||||
Release: 7
|
Release: 8
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
URL: http://www.bluez.org/
|
URL: http://www.bluez.org/
|
||||||
Source0: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
|
Source0: http://www.kernel.org/pub/linux/bluetooth/bluez-%{version}.tar.xz
|
||||||
@ -21,6 +21,11 @@ Patch0008: 0001-policy-Add-logic-to-connect-a-Sink.patch
|
|||||||
Patch0009: fix-CVE-2018-10910-1.patch
|
Patch0009: fix-CVE-2018-10910-1.patch
|
||||||
Patch0010: fix-CVE-2018-10910-2.patch
|
Patch0010: fix-CVE-2018-10910-2.patch
|
||||||
|
|
||||||
|
Patch0011: CVE-2020-0556-1.patch
|
||||||
|
Patch0012: CVE-2020-0556-2.patch
|
||||||
|
Patch0013: CVE-2020-0556-3.patch
|
||||||
|
Patch0014: CVE-2020-0556-4.patch
|
||||||
|
|
||||||
BuildRequires: dbus-devel >= 1.6
|
BuildRequires: dbus-devel >= 1.6
|
||||||
BuildRequires: git-core glib2-devel libical-devel readline-devel libell-devel
|
BuildRequires: git-core glib2-devel libical-devel readline-devel libell-devel
|
||||||
BuildRequires: json-c-devel systemd-devel cups-devel libtool automake autoconf
|
BuildRequires: json-c-devel systemd-devel cups-devel libtool automake autoconf
|
||||||
@ -165,6 +170,12 @@ make check
|
|||||||
%_cups_serverbin/backend/bluetooth
|
%_cups_serverbin/backend/bluetooth
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Apr 22 2020 openEuler Buildteam <buildteam@openeuler.org> - 5.50-8
|
||||||
|
- Type:cves
|
||||||
|
- ID:CVE-2020-0556
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:fix CVE-2020-0556
|
||||||
|
|
||||||
* Wed Mar 18 2020 chenzhen <chenzhen44@huawei.com> - 5.50-7
|
* Wed Mar 18 2020 chenzhen <chenzhen44@huawei.com> - 5.50-7
|
||||||
- Type:cves
|
- Type:cves
|
||||||
- ID:CVE-2018-10910
|
- ID:CVE-2018-10910
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user