automatic version update by autodist [release 5.73-1mamba;Fri Mar 08 2024]
This commit is contained in:
parent
1f2816268e
commit
4ff27186e2
@ -1,542 +0,0 @@
|
|||||||
From 7fe38a17f6bee713fde587487fc224b0ae390e8f Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
||||||
Date: Mon, 10 Jan 2022 17:35:15 -0800
|
|
||||||
Subject: hog: Fix read order of attributes
|
|
||||||
|
|
||||||
The Report Map must be read after all other attributes otherwise the
|
|
||||||
Kernel driver may start using UHID_SET_REPORT which requires the
|
|
||||||
report->id to be known in order to resolve the attribute to send to.
|
|
||||||
|
|
||||||
Fixes: https://github.com/bluez/bluez/issues/220
|
|
||||||
---
|
|
||||||
profiles/input/hog-lib.c | 191 +++++++++++++++++++++++++++++------------------
|
|
||||||
1 file changed, 119 insertions(+), 72 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/profiles/input/hog-lib.c b/profiles/input/hog-lib.c
|
|
||||||
index d37caa1f1..beb19af70 100644
|
|
||||||
--- a/profiles/input/hog-lib.c
|
|
||||||
+++ b/profiles/input/hog-lib.c
|
|
||||||
@@ -90,6 +90,7 @@ struct bt_hog {
|
|
||||||
uint16_t getrep_id;
|
|
||||||
unsigned int setrep_att;
|
|
||||||
uint16_t setrep_id;
|
|
||||||
+ unsigned int report_map_id;
|
|
||||||
struct bt_scpp *scpp;
|
|
||||||
struct bt_dis *dis;
|
|
||||||
struct queue *bas;
|
|
||||||
@@ -146,13 +147,34 @@ static bool set_and_store_gatt_req(struct bt_hog *hog,
|
|
||||||
return queue_push_head(hog->gatt_op, req);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void destroy_gatt_req(struct gatt_request *req)
|
|
||||||
+static void destroy_gatt_req(void *data)
|
|
||||||
{
|
|
||||||
- queue_remove(req->hog->gatt_op, req);
|
|
||||||
+ struct gatt_request *req = data;
|
|
||||||
+
|
|
||||||
bt_hog_unref(req->hog);
|
|
||||||
free(req);
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void read_report_map(struct bt_hog *hog);
|
|
||||||
+
|
|
||||||
+static void remove_gatt_req(struct gatt_request *req, uint8_t status)
|
|
||||||
+{
|
|
||||||
+ struct bt_hog *hog = req->hog;
|
|
||||||
+
|
|
||||||
+ queue_remove(hog->gatt_op, req);
|
|
||||||
+
|
|
||||||
+ if (!status && queue_isempty(hog->gatt_op)) {
|
|
||||||
+ /* Report Map must be read last since that can result
|
|
||||||
+ * in uhid being created and the driver may start to
|
|
||||||
+ * use UHID_SET_REPORT which requires the report->id to
|
|
||||||
+ * be known what attribute to send to.
|
|
||||||
+ */
|
|
||||||
+ read_report_map(hog);
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+ destroy_gatt_req(req);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void write_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
|
|
||||||
const uint8_t *value, size_t vlen,
|
|
||||||
GAttribResultFunc func,
|
|
||||||
@@ -178,27 +200,31 @@ static void write_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void read_char(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
|
|
||||||
- GAttribResultFunc func, gpointer user_data)
|
|
||||||
+static unsigned int read_char(struct bt_hog *hog, GAttrib *attrib,
|
|
||||||
+ uint16_t handle, GAttribResultFunc func,
|
|
||||||
+ gpointer user_data)
|
|
||||||
{
|
|
||||||
struct gatt_request *req;
|
|
||||||
unsigned int id;
|
|
||||||
|
|
||||||
req = create_request(hog, user_data);
|
|
||||||
if (!req)
|
|
||||||
- return;
|
|
||||||
+ return 0;
|
|
||||||
|
|
||||||
id = gatt_read_char(attrib, handle, func, req);
|
|
||||||
if (!id) {
|
|
||||||
error("hog: Could not read char");
|
|
||||||
- return;
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!set_and_store_gatt_req(hog, req, id)) {
|
|
||||||
error("hog: Failed to queue read char req");
|
|
||||||
g_attrib_cancel(attrib, id);
|
|
||||||
free(req);
|
|
||||||
+ return 0;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+ return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void discover_desc(struct bt_hog *hog, GAttrib *attrib,
|
|
||||||
@@ -343,16 +369,14 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
|
|
||||||
struct report *report = req->user_data;
|
|
||||||
struct bt_hog *hog = report->hog;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Write report characteristic descriptor failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (report->notifyid)
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
|
|
||||||
report->notifyid = g_attrib_register(hog->attrib,
|
|
||||||
ATT_OP_HANDLE_NOTIFY,
|
|
||||||
@@ -360,6 +384,9 @@ static void report_ccc_written_cb(guint8 status, const guint8 *pdu,
|
|
||||||
report_value_cb, report, NULL);
|
|
||||||
|
|
||||||
DBG("Report characteristic descriptor written: notifications enabled");
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void write_ccc(struct bt_hog *hog, GAttrib *attrib, uint16_t handle,
|
|
||||||
@@ -379,14 +406,15 @@ static void ccc_read_cb(guint8 status, const guint8 *pdu, guint16 len,
|
|
||||||
struct gatt_request *req = user_data;
|
|
||||||
struct report *report = req->user_data;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Error reading CCC value: %s", att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
write_ccc(report->hog, report->hog->attrib, report->ccc_handle, report);
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char *type_to_string(uint8_t type)
|
|
||||||
@@ -409,17 +437,15 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
|
|
||||||
struct gatt_request *req = user_data;
|
|
||||||
struct report *report = req->user_data;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Read Report Reference descriptor failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (plen != 3) {
|
|
||||||
error("Malformed ATT read response");
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
report->id = pdu[1];
|
|
||||||
@@ -432,6 +458,9 @@ static void report_reference_cb(guint8 status, const guint8 *pdu,
|
|
||||||
if (report->type == HOG_REPORT_TYPE_INPUT)
|
|
||||||
read_char(report->hog, report->hog->attrib, report->ccc_handle,
|
|
||||||
ccc_read_cb, report);
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void external_report_reference_cb(guint8 status, const guint8 *pdu,
|
|
||||||
@@ -442,12 +471,10 @@ static void discover_external_cb(uint8_t status, GSList *descs, void *user_data)
|
|
||||||
struct gatt_request *req = user_data;
|
|
||||||
struct bt_hog *hog = req->user_data;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Discover external descriptors failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( ; descs; descs = descs->next) {
|
|
||||||
@@ -457,6 +484,9 @@ static void discover_external_cb(uint8_t status, GSList *descs, void *user_data)
|
|
||||||
external_report_reference_cb,
|
|
||||||
hog);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void discover_external(struct bt_hog *hog, GAttrib *attrib,
|
|
||||||
@@ -480,12 +510,10 @@ static void discover_report_cb(uint8_t status, GSList *descs, void *user_data)
|
|
||||||
struct report *report = req->user_data;
|
|
||||||
struct bt_hog *hog = report->hog;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Discover report descriptors failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
for ( ; descs; descs = descs->next) {
|
|
||||||
@@ -501,6 +529,9 @@ static void discover_report_cb(uint8_t status, GSList *descs, void *user_data)
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void discover_report(struct bt_hog *hog, GAttrib *attrib,
|
|
||||||
@@ -519,11 +550,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len,
|
|
||||||
struct gatt_request *req = user_data;
|
|
||||||
struct report *report = req->user_data;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Error reading Report value: %s", att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (report->value)
|
|
||||||
@@ -531,6 +560,9 @@ static void report_read_cb(guint8 status, const guint8 *pdu, guint16 len,
|
|
||||||
|
|
||||||
report->value = util_memdup(pdu, len);
|
|
||||||
report->len = len;
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int report_chrc_cmp(const void *data, const void *user_data)
|
|
||||||
@@ -572,12 +604,11 @@ static void external_service_char_cb(uint8_t status, GSList *chars,
|
|
||||||
struct report *report;
|
|
||||||
GSList *l;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
const char *str = att_ecode2str(status);
|
|
||||||
+
|
|
||||||
DBG("Discover external service characteristic failed: %s", str);
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (l = chars; l; l = g_slist_next(l)) {
|
|
||||||
@@ -595,6 +626,9 @@ static void external_service_char_cb(uint8_t status, GSList *chars,
|
|
||||||
end = (next ? next->handle - 1 : primary->range.end);
|
|
||||||
discover_report(hog, hog->attrib, start, end, report);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void external_report_reference_cb(guint8 status, const guint8 *pdu,
|
|
||||||
@@ -605,17 +639,15 @@ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
|
|
||||||
uint16_t uuid16;
|
|
||||||
bt_uuid_t uuid;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Read External Report Reference descriptor failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (plen != 3) {
|
|
||||||
error("Malformed ATT read response");
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
uuid16 = get_le16(&pdu[1]);
|
|
||||||
@@ -624,11 +656,14 @@ static void external_report_reference_cb(guint8 status, const guint8 *pdu,
|
|
||||||
|
|
||||||
/* Do not discover if is not a Report */
|
|
||||||
if (uuid16 != HOG_REPORT_UUID)
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
|
|
||||||
bt_uuid16_create(&uuid, uuid16);
|
|
||||||
discover_char(hog, hog->attrib, 0x0001, 0xffff, &uuid,
|
|
||||||
external_service_char_cb, hog);
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static int report_cmp(gconstpointer a, gconstpointer b)
|
|
||||||
@@ -687,12 +722,10 @@ static void output_written_cb(guint8 status, const guint8 *pdu,
|
|
||||||
{
|
|
||||||
struct gatt_request *req = user_data;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
- if (status != 0) {
|
|
||||||
+ if (status != 0)
|
|
||||||
error("Write output report failed: %s", att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
- }
|
|
||||||
+
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void forward_report(struct uhid_event *ev, void *user_data)
|
|
||||||
@@ -1056,7 +1089,7 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
uint8_t value[HOG_REPORT_MAP_MAX_SIZE];
|
|
||||||
ssize_t vlen;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
|
|
||||||
DBG("HoG inspecting report map");
|
|
||||||
|
|
||||||
@@ -1081,6 +1114,19 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void read_report_map(struct bt_hog *hog)
|
|
||||||
+{
|
|
||||||
+ uint16_t handle;
|
|
||||||
+
|
|
||||||
+ if (!hog->report_map_attr || hog->uhid_created || hog->report_map_id)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ handle = gatt_db_attribute_get_handle(hog->report_map_attr);
|
|
||||||
+
|
|
||||||
+ hog->report_map_id = read_char(hog, hog->attrib, handle,
|
|
||||||
+ report_map_read_cb, hog);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
gpointer user_data)
|
|
||||||
{
|
|
||||||
@@ -1089,18 +1135,16 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
uint8_t value[HID_INFO_SIZE];
|
|
||||||
ssize_t vlen;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("HID Information read failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
vlen = dec_read_resp(pdu, plen, value, sizeof(value));
|
|
||||||
if (vlen != 4) {
|
|
||||||
error("ATT protocol error");
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
hog->bcdhid = get_le16(&value[0]);
|
|
||||||
@@ -1109,6 +1153,9 @@ static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
|
|
||||||
DBG("bcdHID: 0x%04X bCountryCode: 0x%02X Flags: 0x%02X",
|
|
||||||
hog->bcdhid, hog->bcountrycode, hog->flags);
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
@@ -1119,18 +1166,16 @@ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
uint8_t value;
|
|
||||||
ssize_t vlen;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status != 0) {
|
|
||||||
error("Protocol Mode characteristic read failed: %s",
|
|
||||||
att_ecode2str(status));
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
vlen = dec_read_resp(pdu, plen, &value, sizeof(value));
|
|
||||||
if (vlen < 0) {
|
|
||||||
error("ATT protocol error");
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (value == HOG_PROTO_MODE_BOOT) {
|
|
||||||
@@ -1142,6 +1187,9 @@ static void proto_mode_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
|
|
||||||
sizeof(nval), NULL, NULL);
|
|
||||||
} else if (value == HOG_PROTO_MODE_REPORT)
|
|
||||||
DBG("HoG is operating in Report Protocol Mode");
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
|
|
||||||
@@ -1155,14 +1203,12 @@ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
|
|
||||||
GSList *l;
|
|
||||||
uint16_t info_handle = 0, proto_mode_handle = 0;
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
DBG("HoG inspecting characteristics");
|
|
||||||
|
|
||||||
if (status != 0) {
|
|
||||||
- const char *str = att_ecode2str(status);
|
|
||||||
- DBG("Discover all characteristics failed: %s", str);
|
|
||||||
- return;
|
|
||||||
+ DBG("Discover all characteristics failed: %s",
|
|
||||||
+ att_ecode2str(status));
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
bt_uuid16_create(&report_uuid, HOG_REPORT_UUID);
|
|
||||||
@@ -1211,6 +1257,9 @@ static void char_discovered_cb(uint8_t status, GSList *chars, void *user_data)
|
|
||||||
|
|
||||||
if (info_handle)
|
|
||||||
read_char(hog, hog->attrib, info_handle, info_read_cb, hog);
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void report_free(void *data)
|
|
||||||
@@ -1221,10 +1270,12 @@ static void report_free(void *data)
|
|
||||||
g_free(report);
|
|
||||||
}
|
|
||||||
|
|
||||||
-static void cancel_gatt_req(struct gatt_request *req)
|
|
||||||
+static bool cancel_gatt_req(const void *data, const void *user_data)
|
|
||||||
{
|
|
||||||
- if (g_attrib_cancel(req->hog->attrib, req->id))
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
+ struct gatt_request *req = (void *) data;
|
|
||||||
+ const struct bt_hog *hog = user_data;
|
|
||||||
+
|
|
||||||
+ return g_attrib_cancel(hog->attrib, req->id);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hog_free(void *data)
|
|
||||||
@@ -1386,13 +1437,9 @@ static void foreach_hog_chrc(struct gatt_db_attribute *attr, void *user_data)
|
|
||||||
* UHID to optimize reconnection.
|
|
||||||
*/
|
|
||||||
uhid_create(hog, report_map.value, report_map.length);
|
|
||||||
- } else {
|
|
||||||
- read_char(hog, hog->attrib, value_handle,
|
|
||||||
- report_map_read_cb, hog);
|
|
||||||
}
|
|
||||||
|
|
||||||
gatt_db_service_foreach_desc(attr, foreach_hog_external, hog);
|
|
||||||
- return;
|
|
||||||
}
|
|
||||||
|
|
||||||
bt_uuid16_create(&info_uuid, HOG_INFO_UUID);
|
|
||||||
@@ -1552,12 +1599,9 @@ static void find_included_cb(uint8_t status, GSList *services, void *user_data)
|
|
||||||
|
|
||||||
DBG("");
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status) {
|
|
||||||
- const char *str = att_ecode2str(status);
|
|
||||||
- DBG("Find included failed: %s", str);
|
|
||||||
- return;
|
|
||||||
+ DBG("Find included failed: %s", att_ecode2str(status));
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (l = services; l; l = l->next) {
|
|
||||||
@@ -1566,6 +1610,9 @@ static void find_included_cb(uint8_t status, GSList *services, void *user_data)
|
|
||||||
DBG("included: handle %x, uuid %s",
|
|
||||||
include->handle, include->uuid);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void hog_attach_scpp(struct bt_hog *hog, struct gatt_primary *primary)
|
|
||||||
@@ -1640,17 +1687,14 @@ static void primary_cb(uint8_t status, GSList *services, void *user_data)
|
|
||||||
|
|
||||||
DBG("");
|
|
||||||
|
|
||||||
- destroy_gatt_req(req);
|
|
||||||
-
|
|
||||||
if (status) {
|
|
||||||
- const char *str = att_ecode2str(status);
|
|
||||||
- DBG("Discover primary failed: %s", str);
|
|
||||||
- return;
|
|
||||||
+ DBG("Discover primary failed: %s", att_ecode2str(status));
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!services) {
|
|
||||||
DBG("No primary service found");
|
|
||||||
- return;
|
|
||||||
+ goto remove;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (l = services; l; l = l->next) {
|
|
||||||
@@ -1674,6 +1718,9 @@ static void primary_cb(uint8_t status, GSList *services, void *user_data)
|
|
||||||
if (strcmp(primary->uuid, HOG_UUID) == 0)
|
|
||||||
hog_attach_hog(hog, primary);
|
|
||||||
}
|
|
||||||
+
|
|
||||||
+remove:
|
|
||||||
+ remove_gatt_req(req, status);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool bt_hog_attach(struct bt_hog *hog, void *gatt)
|
|
||||||
@@ -1790,7 +1837,7 @@ void bt_hog_detach(struct bt_hog *hog)
|
|
||||||
if (hog->dis)
|
|
||||||
bt_dis_detach(hog->dis);
|
|
||||||
|
|
||||||
- queue_foreach(hog->gatt_op, (void *) cancel_gatt_req, NULL);
|
|
||||||
+ queue_remove_all(hog->gatt_op, cancel_gatt_req, hog, destroy_gatt_req);
|
|
||||||
g_attrib_unref(hog->attrib);
|
|
||||||
hog->attrib = NULL;
|
|
||||||
uhid_destroy(hog);
|
|
||||||
--
|
|
||||||
cgit
|
|
||||||
|
|
||||||
@ -1,63 +0,0 @@
|
|||||||
From 8edd9ff4e4ea85c80bee00a4a46b1cae3678dea6 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
||||||
Date: Wed, 12 Jan 2022 07:22:22 -0800
|
|
||||||
Subject: media: Fix crash when endpoint replies with an error to
|
|
||||||
SetConfiguration
|
|
||||||
|
|
||||||
If endpoint responds to SetConfiguration the transport is being
|
|
||||||
destroyed without removing it from the list leading a crash.
|
|
||||||
|
|
||||||
Fixes: https://github.com/bluez/bluez/issues/269
|
|
||||||
---
|
|
||||||
profiles/audio/media.c | 21 +++++++++++++--------
|
|
||||||
1 file changed, 13 insertions(+), 8 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
|
|
||||||
index edefedc90..8162417ce 100644
|
|
||||||
--- a/profiles/audio/media.c
|
|
||||||
+++ b/profiles/audio/media.c
|
|
||||||
@@ -241,6 +241,16 @@ static struct media_adapter *find_adapter(struct btd_device *device)
|
|
||||||
return NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void endpoint_remove_transport(struct media_endpoint *endpoint,
|
|
||||||
+ struct media_transport *transport)
|
|
||||||
+{
|
|
||||||
+ if (!endpoint || !transport)
|
|
||||||
+ return;
|
|
||||||
+
|
|
||||||
+ endpoint->transports = g_slist_remove(endpoint->transports, transport);
|
|
||||||
+ media_transport_destroy(transport);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void clear_configuration(struct media_endpoint *endpoint,
|
|
||||||
struct media_transport *transport)
|
|
||||||
{
|
|
||||||
@@ -260,8 +270,7 @@ static void clear_configuration(struct media_endpoint *endpoint,
|
|
||||||
DBUS_TYPE_INVALID);
|
|
||||||
g_dbus_send_message(btd_get_dbus_connection(), msg);
|
|
||||||
done:
|
|
||||||
- endpoint->transports = g_slist_remove(endpoint->transports, transport);
|
|
||||||
- media_transport_destroy(transport);
|
|
||||||
+ endpoint_remove_transport(endpoint, transport);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void clear_endpoint(struct media_endpoint *endpoint)
|
|
||||||
@@ -301,12 +310,8 @@ static void endpoint_reply(DBusPendingCall *call, void *user_data)
|
|
||||||
|
|
||||||
if (dbus_message_is_method_call(request->msg,
|
|
||||||
MEDIA_ENDPOINT_INTERFACE,
|
|
||||||
- "SetConfiguration")) {
|
|
||||||
- if (request->transport == NULL)
|
|
||||||
- error("Expected to destroy transport");
|
|
||||||
- else
|
|
||||||
- media_transport_destroy(request->transport);
|
|
||||||
- }
|
|
||||||
+ "SetConfiguration"))
|
|
||||||
+ endpoint_remove_transport(endpoint, request->transport);
|
|
||||||
|
|
||||||
dbus_error_free(&err);
|
|
||||||
goto done;
|
|
||||||
--
|
|
||||||
cgit
|
|
||||||
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
From 19448b9cb852b8c38f15362e185e6b18d634859d Mon Sep 17 00:00:00 2001
|
|
||||||
From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
|
|
||||||
Date: Thu, 3 Feb 2022 17:29:25 -0800
|
|
||||||
Subject: gdbus: Emit InterfacesAdded of parents objects first
|
|
||||||
|
|
||||||
This makes InterfacesAdded respect the object hierarchy in case its
|
|
||||||
parent has pending interfaces to be added.
|
|
||||||
|
|
||||||
Fixes: https://github.com/bluez/bluez/issues/272
|
|
||||||
Fixes: https://github.com/bluez/bluez/issues/284
|
|
||||||
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1534857
|
|
||||||
Fixes: https://bugs.archlinux.org/task/57464
|
|
||||||
---
|
|
||||||
gdbus/object.c | 6 ++++++
|
|
||||||
1 file changed, 6 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/gdbus/object.c b/gdbus/object.c
|
|
||||||
index 50a8b4ff1..f7c8c2be5 100644
|
|
||||||
--- a/gdbus/object.c
|
|
||||||
+++ b/gdbus/object.c
|
|
||||||
@@ -551,6 +551,12 @@ static void emit_interfaces_added(struct generic_data *data)
|
|
||||||
if (root == NULL || data == root)
|
|
||||||
return;
|
|
||||||
|
|
||||||
+ /* Emit InterfacesAdded on the parent first so it appears first on the
|
|
||||||
+ * bus as child objects may point to it.
|
|
||||||
+ */
|
|
||||||
+ if (data->parent && data->parent->added)
|
|
||||||
+ emit_interfaces_added(data->parent);
|
|
||||||
+
|
|
||||||
signal = dbus_message_new_signal(root->path,
|
|
||||||
DBUS_INTERFACE_OBJECT_MANAGER,
|
|
||||||
"InterfacesAdded");
|
|
||||||
--
|
|
||||||
cgit
|
|
||||||
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
--- bluez-5.66/src/bluetooth.service.in.orig 2023-01-03 15:15:35.104096174 +0100
|
|
||||||
+++ bluez-5.66/src/bluetooth.service.in 2023-01-03 15:15:44.208046473 +0100
|
|
||||||
@@ -6,7 +6,7 @@
|
|
||||||
[Service]
|
|
||||||
Type=dbus
|
|
||||||
BusName=org.bluez
|
|
||||||
-ExecStart=@pkglibexecdir@/bluetoothd
|
|
||||||
+ExecStart=@pkglibexecdir@/bluetoothd -E -K
|
|
||||||
NotifyAccess=main
|
|
||||||
#WatchdogSec=10
|
|
||||||
#Restart=on-failure
|
|
||||||
11
bluez-5.73-bluetoothd-enable-experimental.patch
Normal file
11
bluez-5.73-bluetoothd-enable-experimental.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- bluez-5.73/src/bluetooth.service.in.orig 2024-03-08 10:09:27.712574174 +0100
|
||||||
|
+++ bluez-5.73/src/bluetooth.service.in 2024-03-08 10:09:38.341598314 +0100
|
||||||
|
@@ -6,7 +6,7 @@
|
||||||
|
[Service]
|
||||||
|
Type=dbus
|
||||||
|
BusName=org.bluez
|
||||||
|
-ExecStart=@PKGLIBEXECDIR@/bluetoothd
|
||||||
|
+ExecStart=@PKGLIBEXECDIR@/bluetoothd -E -K
|
||||||
|
NotifyAccess=main
|
||||||
|
#WatchdogSec=10
|
||||||
|
#Restart=on-failure
|
||||||
19
bluez.spec
19
bluez.spec
@ -1,5 +1,5 @@
|
|||||||
Name: bluez
|
Name: bluez
|
||||||
Version: 5.72
|
Version: 5.73
|
||||||
Release: 1mamba
|
Release: 1mamba
|
||||||
Summary: Userspace tools for the Bluetooth wireless library for Linux
|
Summary: Userspace tools for the Bluetooth wireless library for Linux
|
||||||
Group: Applications/Communication
|
Group: Applications/Communication
|
||||||
@ -13,10 +13,7 @@ Patch0: bluez5-5.66-mode-43xx-firmware-into-lib-firmware.patch
|
|||||||
Patch1: bluez5-5.41-bcm43xx-Add-bcm43xx-3wire-variant.patch
|
Patch1: bluez5-5.41-bcm43xx-Add-bcm43xx-3wire-variant.patch
|
||||||
Patch2: bluez5-5.41-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
|
Patch2: bluez5-5.41-bcm43xx-The-UART-speed-must-be-reset-after-the-firmw.patch
|
||||||
Patch3: bluez5-5.41-Increase-firmware-load-timeout-to-30s.patch
|
Patch3: bluez5-5.41-Increase-firmware-load-timeout-to-30s.patch
|
||||||
Patch4: bluez-5.63-0001-hog-Fix-read-order-of-attributes.patch
|
Patch4: bluez-5.73-bluetoothd-enable-experimental.patch
|
||||||
Patch5: bluez-5.63-0002_Fix_crash_when_endpoint_replies_with_an_error_to_SetConfiguration.patch
|
|
||||||
Patch6: bluez-5.63-0003_gdbus_Emit_InterfacesAdded_of_parents_objects_first.patch
|
|
||||||
Patch7: bluez-5.66-bluetoothd-enable-experimental.patch
|
|
||||||
License: GPL
|
License: GPL
|
||||||
## AUTOBUILDREQ-BEGIN
|
## AUTOBUILDREQ-BEGIN
|
||||||
BuildRequires: glibc-devel
|
BuildRequires: glibc-devel
|
||||||
@ -74,10 +71,7 @@ This package contains static libraries and header files neeed for development.
|
|||||||
%patch 1 -p1
|
%patch 1 -p1
|
||||||
%patch 2 -p1
|
%patch 2 -p1
|
||||||
%patch 3 -p1
|
%patch 3 -p1
|
||||||
#%patch4 -p1 -b .0001-hog-Fix-read-order-of-attributes#
|
%patch 4 -p1
|
||||||
#%patch5 -p1 -b .0002_Fix_crash_when_endpoint_replies_with_an_error_to_SetConfiguratio#n
|
|
||||||
#%patch6 -p1 -b .0003_gdbus_Emit_InterfacesAdded_of_parents_objects_first
|
|
||||||
%patch 7 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
@ -176,8 +170,8 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
|
|||||||
%files -n libbluetooth
|
%files -n libbluetooth
|
||||||
%defattr(-,root,root)
|
%defattr(-,root,root)
|
||||||
%{_libdir}/libbluetooth.so.*
|
%{_libdir}/libbluetooth.so.*
|
||||||
%dir %{_libdir}/bluetooth/plugins
|
#%dir %{_libdir}/bluetooth/plugins
|
||||||
%{_libdir}/bluetooth/plugins/sixaxis.so
|
#%{_libdir}/bluetooth/plugins/sixaxis.so
|
||||||
%doc AUTHORS COPYING
|
%doc AUTHORS COPYING
|
||||||
|
|
||||||
%files -n libbluetooth-devel
|
%files -n libbluetooth-devel
|
||||||
@ -190,6 +184,9 @@ find /etc/rc[0-6].d/ -type l -xtype l -exec rm -f {} \;
|
|||||||
%doc ChangeLog README
|
%doc ChangeLog README
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Mar 08 2024 Automatic Build System <autodist@openmamba.org> 5.73-1mamba
|
||||||
|
- automatic version update by autodist
|
||||||
|
|
||||||
* Sat Jan 13 2024 Automatic Build System <autodist@openmamba.org> 5.72-1mamba
|
* Sat Jan 13 2024 Automatic Build System <autodist@openmamba.org> 5.72-1mamba
|
||||||
- automatic version update by autodist
|
- automatic version update by autodist
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user