Update to 5.83
Resolves: RHEL-94817
This commit is contained in:
Bastien Nocera
parent
eb20a1b398
commit
1886ee4181
@ -1,4 +1,4 @@
|
||||
From 60b4624089e460a4908c1887de0e777c0453a503 Mon Sep 17 00:00:00 2001
|
||||
From 8cc47ce7b9bd16e560b5cf13a7c0e1ac612bf59a Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 10 May 2024 13:47:29 +0200
|
||||
Subject: [PATCH] main: Simplify parse_config_string()
|
||||
@ -29,7 +29,7 @@ bluez-5.75/src/main.c:440:2: leaked_storage: Variable "tmp" going out of scope l
|
||||
1 file changed, 14 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index d13ada2afc5b..bde63462ecda 100644
|
||||
index 3c51a0092425..4ac442b37a85 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -430,9 +430,14 @@ static bool parse_config_string(GKeyFile *config, const char *group,
|
||||
@ -63,7 +63,7 @@ index d13ada2afc5b..bde63462ecda 100644
|
||||
|
||||
return true;
|
||||
}
|
||||
@@ -1031,7 +1031,12 @@ static void parse_secure_conns(GKeyFile *config)
|
||||
@@ -1022,7 +1022,12 @@ static void parse_secure_conns(GKeyFile *config)
|
||||
|
||||
static void parse_general(GKeyFile *config)
|
||||
{
|
||||
@ -78,5 +78,5 @@ index d13ada2afc5b..bde63462ecda 100644
|
||||
parse_config_u32(config, "General", "DiscoverableTimeout",
|
||||
&btd_opts.discovto,
|
||||
--
|
||||
2.48.1
|
||||
2.49.0
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From f0febd73bffd78e080499d87dc03eea7622dd876 Mon Sep 17 00:00:00 2001
|
||||
From 48c0a18b1f4367935588c3c1a26280f52eed5502 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 2 Jul 2024 15:27:12 +0200
|
||||
Subject: [PATCH] shared/shell: Free memory allocated by wordexp()
|
||||
@ -61,10 +61,10 @@ bluez-5.76/src/shared/shell.c:1423:4: leaked_storage: Variable "w" going out of
|
||||
1 file changed, 20 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/src/shared/shell.c b/src/shared/shell.c
|
||||
index 73b4c704174a..60d37c9e56a7 100644
|
||||
index 6b4f7a7ef503..cac19d6307c6 100644
|
||||
--- a/src/shared/shell.c
|
||||
+++ b/src/shared/shell.c
|
||||
@@ -498,13 +498,23 @@ static void shell_print_menu_zsh_complete(void)
|
||||
@@ -503,13 +503,23 @@ static void shell_print_menu_zsh_complete(void)
|
||||
}
|
||||
}
|
||||
|
||||
@ -89,7 +89,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
free(str);
|
||||
return -EINVAL;
|
||||
}
|
||||
@@ -526,6 +536,7 @@ static int cmd_exec(const struct bt_shell_menu_entry *entry,
|
||||
@@ -531,6 +541,7 @@ static int cmd_exec(const struct bt_shell_menu_entry *entry,
|
||||
char *man, *opt;
|
||||
int flags = WRDE_NOCMD;
|
||||
bool optargs = false;
|
||||
@ -97,7 +97,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
|
||||
if (argc == 2 && (!memcmp(argv[1], "help", 4) ||
|
||||
!memcmp(argv[1], "--help", 6))) {
|
||||
@@ -583,8 +594,10 @@ static int cmd_exec(const struct bt_shell_menu_entry *entry,
|
||||
@@ -588,8 +599,10 @@ static int cmd_exec(const struct bt_shell_menu_entry *entry,
|
||||
goto fail;
|
||||
}
|
||||
|
||||
@ -109,7 +109,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
|
||||
optional:
|
||||
if (parse_args(opt, &w, "[]", flags) < 0) {
|
||||
@@ -598,6 +611,7 @@ optional:
|
||||
@@ -602,6 +615,7 @@ optional:
|
||||
free(opt);
|
||||
|
||||
/* Check if there are too many arguments */
|
||||
@ -117,7 +117,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
if (!optargs && ((unsigned int) argc - 1 > w.we_wordc && !w.we_offs)) {
|
||||
print_text(COLOR_HIGHLIGHT, "Too many arguments: %d > %zu",
|
||||
argc - 1, w.we_wordc);
|
||||
@@ -1089,7 +1103,7 @@ static char **args_completion(const struct bt_shell_menu_entry *entry, int argc,
|
||||
@@ -1096,7 +1110,7 @@ static char **args_completion(const struct bt_shell_menu_entry *entry, int argc,
|
||||
args.we_offs = 0;
|
||||
wordfree(&args);
|
||||
|
||||
@ -126,7 +126,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
goto done;
|
||||
|
||||
rl_completion_display_matches_hook = NULL;
|
||||
@@ -1161,7 +1175,7 @@ static char **shell_completion(const char *text, int start, int end)
|
||||
@@ -1168,7 +1182,7 @@ static char **shell_completion(const char *text, int start, int end)
|
||||
if (start > 0) {
|
||||
wordexp_t w;
|
||||
|
||||
@ -135,7 +135,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
return NULL;
|
||||
|
||||
matches = menu_completion(default_menu, text, w.we_wordc,
|
||||
@@ -1464,7 +1478,7 @@ int bt_shell_exec(const char *input)
|
||||
@@ -1481,7 +1495,7 @@ int bt_shell_exec(const char *input)
|
||||
if (data.monitor)
|
||||
bt_log_printf(0xffff, data.name, LOG_INFO, "%s", input);
|
||||
|
||||
@ -144,7 +144,7 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
switch (err) {
|
||||
case WRDE_BADCHAR:
|
||||
return -EBADMSG;
|
||||
@@ -1474,7 +1488,7 @@ int bt_shell_exec(const char *input)
|
||||
@@ -1491,7 +1505,7 @@ int bt_shell_exec(const char *input)
|
||||
case WRDE_NOSPACE:
|
||||
return -ENOMEM;
|
||||
case WRDE_CMDSUB:
|
||||
@ -154,5 +154,5 @@ index 73b4c704174a..60d37c9e56a7 100644
|
||||
break;
|
||||
};
|
||||
--
|
||||
2.48.1
|
||||
2.49.0
|
||||
|
||||
|
||||
17
bluez.spec
17
bluez.spec
@ -5,16 +5,14 @@
|
||||
%endif
|
||||
|
||||
Name: bluez
|
||||
Version: 5.77
|
||||
Release: 8%{?dist}
|
||||
Version: 5.83
|
||||
Release: 1%{?dist}
|
||||
Summary: Bluetooth utilities
|
||||
License: GPL-2.0-or-later
|
||||
URL: http://www.bluez.org/
|
||||
|
||||
Source0: https://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.xz
|
||||
|
||||
# Upstream patches
|
||||
Patch0: 5.77-devel.patch
|
||||
# https://patchwork.kernel.org/project/bluetooth/patch/20240702084900.773620-2-hadess@hadess.net/
|
||||
Patch1: 0001-main-Simplify-parse_config_string.patch
|
||||
# https://patchwork.kernel.org/project/bluetooth/patch/20240704102617.1132337-4-hadess@hadess.net/
|
||||
@ -23,8 +21,6 @@ Patch2: 0001-shared-shell-Free-memory-allocated-by-wordexp.patch
|
||||
Patch3: static-analysis-issues-6.patch
|
||||
# Coverity downstream patches
|
||||
Patch4: coverity-workarounds.patch
|
||||
# https://patchwork.kernel.org/project/bluetooth/list/?series=912795&state=*
|
||||
Patch5: startup-warnings.patch
|
||||
|
||||
BuildRequires: dbus-devel >= 1.6
|
||||
BuildRequires: glib2-devel
|
||||
@ -270,6 +266,7 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
|
||||
%{_datadir}/dbus-1/system.d/bluetooth.conf
|
||||
%{_datadir}/dbus-1/system-services/org.bluez.service
|
||||
%{_unitdir}/bluetooth.service
|
||||
%{_userunitdir}/mpris-proxy.service
|
||||
%{_datadir}/zsh/site-functions/_bluetoothctl
|
||||
|
||||
%if %{with deprecated}
|
||||
@ -307,7 +304,10 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
|
||||
%{_mandir}/man1/l2ping.1.*
|
||||
%{_mandir}/man1/rctest.1.*
|
||||
%{_mandir}/man5/org.bluez.*.5.*
|
||||
%{_mandir}/man7/hci.7.*
|
||||
%{_mandir}/man7/l2cap.7.*
|
||||
%{_mandir}/man7/mgmt.7.*
|
||||
%{_mandir}/man7/sco.7.*
|
||||
%{_mandir}/man7/rfcomm.7.*
|
||||
%{_libdir}/libbluetooth.so
|
||||
%{_includedir}/bluetooth
|
||||
@ -338,9 +338,14 @@ install emulator/btvirt ${RPM_BUILD_ROOT}/%{_libexecdir}/bluetooth/
|
||||
%{_libexecdir}/bluetooth/obexd
|
||||
%{_datadir}/dbus-1/services/org.bluez.obex.service
|
||||
/usr/lib/systemd/user/dbus-org.bluez.obex.service
|
||||
%{_datadir}/dbus-1/system.d/obex.conf
|
||||
%{_userunitdir}/obex.service
|
||||
|
||||
%changelog
|
||||
* Fri Jun 13 2025 Bastien Nocera <bnocera@redhat.com> - 5.83-1
|
||||
- Update to 5.83
|
||||
- Resolves: RHEL-94817
|
||||
|
||||
* Mon Apr 28 2025 Bastien Nocera <bnocera@redhat.com> - 5.77-8
|
||||
- Fix startup warnings
|
||||
- Resolves: RHEL-88703
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From ad622447efc5429a5dc3f84c722a81cc41658e7e Mon Sep 17 00:00:00 2001
|
||||
From 10631ec6213213085de4da0f274b8f608e29053f Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Mon, 5 Aug 2024 12:17:29 +0200
|
||||
Subject: [PATCH 1/8] monitor: Work-around overflow_sink Case #01164573
|
||||
@ -22,10 +22,10 @@ index 62857b4b84de..40e8a3a90c05 100644
|
||||
|
||||
while (data->offset >= MGMT_HDR_SIZE) {
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From c2a1630f0e484c4330c565c56e9a26f8f1ae2664 Mon Sep 17 00:00:00 2001
|
||||
From 9dc3bf02dec24eaf4577e7f0a44618c6a3e83a44 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 30 Jul 2024 15:45:18 +0200
|
||||
Subject: [PATCH 2/8] mesh/net: Work-around memory overallocation warning
|
||||
@ -47,10 +47,10 @@ bluez-5.77/mesh/net.c:3316:2: overrun-buffer-arg: Overrunning array "payload->bu
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/mesh/net.c b/mesh/net.c
|
||||
index ef6a3133859a..ca2cda8ec948 100644
|
||||
index 2483e23c4229..466a12833117 100644
|
||||
--- a/mesh/net.c
|
||||
+++ b/mesh/net.c
|
||||
@@ -3306,6 +3306,7 @@ bool mesh_net_app_send(struct mesh_net *net, bool frnd_cred, uint16_t src,
|
||||
@@ -3307,6 +3307,7 @@ bool mesh_net_app_send(struct mesh_net *net, bool frnd_cred, uint16_t src,
|
||||
|
||||
/* Setup OTA Network send */
|
||||
payload = mesh_sar_new(msg_len);
|
||||
@ -59,10 +59,10 @@ index ef6a3133859a..ca2cda8ec948 100644
|
||||
payload->len = msg_len;
|
||||
payload->src = src;
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 6494fc8665f89b70b8e9d80b829eabc71a22278f Mon Sep 17 00:00:00 2001
|
||||
From a42b6e001d6c96f7bca276f022925b3cfe10af83 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 17 Jul 2024 12:51:56 +0200
|
||||
Subject: [PATCH 3/8] shared/shell: Work-around SAT-45980 with wordexp()
|
||||
@ -82,10 +82,10 @@ bluez-5.77/src/shared/shell.c:558:3: leaked_storage: Variable "w" going out of s
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/shared/shell.c b/src/shared/shell.c
|
||||
index 26c6a419af22..9d2b50b260f9 100644
|
||||
index cac19d6307c6..773d80e14b8f 100644
|
||||
--- a/src/shared/shell.c
|
||||
+++ b/src/shared/shell.c
|
||||
@@ -555,6 +555,7 @@ optional:
|
||||
@@ -609,6 +609,7 @@ optional:
|
||||
print_text(COLOR_HIGHLIGHT,
|
||||
"Unable to parse optional command arguments: %s", opt);
|
||||
free(opt);
|
||||
@ -94,10 +94,10 @@ index 26c6a419af22..9d2b50b260f9 100644
|
||||
}
|
||||
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 99c12a3e56129361ed50934054876126b1e55881 Mon Sep 17 00:00:00 2001
|
||||
From c36f13f3b34d434fc275a1bab18c1064959e3bf0 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 17 Jul 2024 11:28:17 +0200
|
||||
Subject: [PATCH 4/8] sdp: Work-around #01163325 with single-linked list
|
||||
@ -180,10 +180,10 @@ index 71d3d9e95044..2f043cb7f010 100644
|
||||
} while (scanned < (ssize_t) size && bytesleft > 0);
|
||||
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 6fcbf34a02133628a1a8afeabb093270ca89dbb8 Mon Sep 17 00:00:00 2001
|
||||
From 4fa100763db20e02af1956e970df8b29beb02907 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 18 Jul 2024 15:05:07 +0200
|
||||
Subject: [PATCH 5/8] mesh: Quiet imprecise "overrun-buffer-val" #01163326
|
||||
@ -233,10 +233,10 @@ bluez-5.77/mesh/net.c:2053:3: overrun-buffer-val: Overrunning array "sar_in->buf
|
||||
2 files changed, 5 insertions(+)
|
||||
|
||||
diff --git a/mesh/friend.c b/mesh/friend.c
|
||||
index 5b73da68916f..bb8f62e9f57f 100644
|
||||
index 6aacf6338f24..3265412f9af5 100644
|
||||
--- a/mesh/friend.c
|
||||
+++ b/mesh/friend.c
|
||||
@@ -323,6 +323,7 @@ static void clear_retry(struct l_timeout *timeout, void *user_data)
|
||||
@@ -325,6 +325,7 @@ static void clear_retry(struct l_timeout *timeout, void *user_data)
|
||||
|
||||
l_put_be16(neg->lp_addr, msg + 1);
|
||||
l_put_be16(neg->lp_cnt, msg + 3);
|
||||
@ -245,10 +245,10 @@ index 5b73da68916f..bb8f62e9f57f 100644
|
||||
mesh_net_get_iv_index(neg->net), DEFAULT_TTL,
|
||||
0, 0, neg->old_friend,
|
||||
diff --git a/mesh/net.c b/mesh/net.c
|
||||
index ca2cda8ec948..9d6c2ae5142f 100644
|
||||
index 466a12833117..fd5c3fb63100 100644
|
||||
--- a/mesh/net.c
|
||||
+++ b/mesh/net.c
|
||||
@@ -273,6 +273,7 @@ static void send_hb_publication(void *data)
|
||||
@@ -274,6 +274,7 @@ static void send_hb_publication(void *data)
|
||||
l_put_be16(net->features, msg + n);
|
||||
n += 2;
|
||||
|
||||
@ -256,7 +256,7 @@ index ca2cda8ec948..9d6c2ae5142f 100644
|
||||
mesh_net_transport_send(net, 0, 0, mesh_net_get_iv_index(net),
|
||||
pub->ttl, 0, 0, pub->dst, msg, n);
|
||||
}
|
||||
@@ -1460,6 +1461,7 @@ static void send_frnd_ack(struct mesh_net *net, uint16_t src, uint16_t dst,
|
||||
@@ -1461,6 +1462,7 @@ static void send_frnd_ack(struct mesh_net *net, uint16_t src, uint16_t dst,
|
||||
friend_ack_rxed(net, mesh_net_get_iv_index(net),
|
||||
mesh_net_next_seq_num(net), 0, dst, msg);
|
||||
} else {
|
||||
@ -264,7 +264,7 @@ index ca2cda8ec948..9d6c2ae5142f 100644
|
||||
mesh_net_transport_send(net, 0, 0,
|
||||
mesh_net_get_iv_index(net), DEFAULT_TTL,
|
||||
0, 0, dst, msg, sizeof(msg));
|
||||
@@ -1495,6 +1497,7 @@ static void send_net_ack(struct mesh_net *net, struct mesh_sar *sar,
|
||||
@@ -1496,6 +1498,7 @@ static void send_net_ack(struct mesh_net *net, struct mesh_sar *sar,
|
||||
return;
|
||||
}
|
||||
|
||||
@ -272,7 +272,7 @@ index ca2cda8ec948..9d6c2ae5142f 100644
|
||||
mesh_net_transport_send(net, 0, sar->net_idx,
|
||||
mesh_net_get_iv_index(net), DEFAULT_TTL,
|
||||
0, src, dst, msg,
|
||||
@@ -2050,6 +2053,7 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
|
||||
@@ -2051,6 +2054,7 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
|
||||
/* Got it all */
|
||||
send_net_ack(net, sar_in, expected);
|
||||
|
||||
@ -281,10 +281,10 @@ index ca2cda8ec948..9d6c2ae5142f 100644
|
||||
sar_in->remote, dst, key_aid, true, szmic,
|
||||
sar_in->seqZero, sar_in->buf, sar_in->len);
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 91066706378840f28146e51702e3ed8c1780dcd9 Mon Sep 17 00:00:00 2001
|
||||
From d81b03e2e7da40ee8024f2a5bee6e873f0bf7607 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 18 Jul 2024 15:37:58 +0200
|
||||
Subject: [PATCH 6/8] mesh: Quiet imprecise "overrun-buffer-val" #01163327
|
||||
@ -327,10 +327,10 @@ bluez-5.77/mesh/net.c:3284:2: overrun-call: Overrunning callee's array of size 1
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/mesh/net.c b/mesh/net.c
|
||||
index 9d6c2ae5142f..30dcdb2fe517 100644
|
||||
index fd5c3fb63100..dff4b02e459a 100644
|
||||
--- a/mesh/net.c
|
||||
+++ b/mesh/net.c
|
||||
@@ -1776,6 +1776,7 @@ static bool msg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
|
||||
@@ -1777,6 +1777,7 @@ static bool msg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
|
||||
hdr |= SEG_MAX(true, size) << SEGN_HDR_SHIFT;
|
||||
}
|
||||
|
||||
@ -338,7 +338,7 @@ index 9d6c2ae5142f..30dcdb2fe517 100644
|
||||
if (friend_packet_queue(net, iv_index, false, frnd_ttl,
|
||||
seq, src, dst,
|
||||
hdr, data, size))
|
||||
@@ -2054,6 +2055,7 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
|
||||
@@ -2055,6 +2056,7 @@ static bool seg_rxed(struct mesh_net *net, bool frnd, uint32_t iv_index,
|
||||
send_net_ack(net, sar_in, expected);
|
||||
|
||||
/* coverity[overrun-buffer-val] : FALSE */
|
||||
@ -346,7 +346,7 @@ index 9d6c2ae5142f..30dcdb2fe517 100644
|
||||
msg_rxed(net, frnd, iv_index, ttl, seq, net_idx,
|
||||
sar_in->remote, dst, key_aid, true, szmic,
|
||||
sar_in->seqZero, sar_in->buf, sar_in->len);
|
||||
@@ -3289,6 +3291,7 @@ bool mesh_net_app_send(struct mesh_net *net, bool frnd_cred, uint16_t src,
|
||||
@@ -3290,6 +3292,7 @@ bool mesh_net_app_send(struct mesh_net *net, bool frnd_cred, uint16_t src,
|
||||
segmented |= !!(seg_max);
|
||||
|
||||
/* First enqueue to any Friends and internal models */
|
||||
@ -355,10 +355,10 @@ index 9d6c2ae5142f..30dcdb2fe517 100644
|
||||
key_aid, segmented, szmic, seq & SEQ_ZERO_MASK,
|
||||
msg, msg_len);
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 1a1239f998ca15dd233e2adaa2ce12f4ae97e5d1 Mon Sep 17 00:00:00 2001
|
||||
From cadfe79f64ab0ad1cc7682196c4746b270bd0e81 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 19 Jul 2024 15:06:24 +0200
|
||||
Subject: [PATCH 7/8] shared/gatt-db: Work-around overrun-buffer-arg case
|
||||
@ -416,10 +416,10 @@ bluez-5.77/src/shared/gatt-db.c:1006:3: overrun-buffer-arg: Overrunning array "v
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
|
||||
index cd0eba6bf1d0..9045a53c6dfe 100644
|
||||
index c990dcd057eb..9de76c76bc33 100644
|
||||
--- a/src/shared/gatt-db.c
|
||||
+++ b/src/shared/gatt-db.c
|
||||
@@ -616,6 +616,7 @@ static struct gatt_db_service *gatt_db_service_create(const bt_uuid_t *uuid,
|
||||
@@ -622,6 +622,7 @@ static struct gatt_db_service *gatt_db_service_create(const bt_uuid_t *uuid,
|
||||
|
||||
len = uuid_to_le(uuid, value);
|
||||
|
||||
@ -427,7 +427,7 @@ index cd0eba6bf1d0..9045a53c6dfe 100644
|
||||
service->attributes[0] = new_attribute(service, handle, type, value,
|
||||
len);
|
||||
if (!service->attributes[0]) {
|
||||
@@ -980,6 +981,7 @@ service_insert_characteristic(struct gatt_db_service *service,
|
||||
@@ -986,6 +987,7 @@ service_insert_characteristic(struct gatt_db_service *service,
|
||||
len += sizeof(uint16_t);
|
||||
len += uuid_to_le(uuid, &value[3]);
|
||||
|
||||
@ -435,10 +435,10 @@ index cd0eba6bf1d0..9045a53c6dfe 100644
|
||||
service->attributes[i] = new_attribute(service, handle,
|
||||
&characteristic_uuid,
|
||||
value, len);
|
||||
@@ -1007,8 +1009,11 @@ service_insert_characteristic(struct gatt_db_service *service,
|
||||
@@ -1017,8 +1019,11 @@ service_insert_characteristic(struct gatt_db_service *service,
|
||||
if (!(*chrc) || !(*chrc)->value)
|
||||
return NULL;
|
||||
|
||||
/* Update handle of characteristic value_handle if it has changed */
|
||||
put_le16(value_handle, &value[1]);
|
||||
- if (memcmp((*chrc)->value, value, len))
|
||||
+ /* coverity[overrun-buffer-arg] : FALSE */
|
||||
+ if (memcmp((*chrc)->value, value, len)) {
|
||||
@ -449,10 +449,10 @@ index cd0eba6bf1d0..9045a53c6dfe 100644
|
||||
set_attribute_data(service->attributes[i], read_func, write_func,
|
||||
permissions, user_data);
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From cddd78cb6d2a780b352e27ea5e7e44378f8a8ef4 Mon Sep 17 00:00:00 2001
|
||||
From 88ce195aa191ab97f9a6b86d0234011658b68b5e Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Tue, 30 Jul 2024 15:27:49 +0200
|
||||
Subject: [PATCH 8/8] shared/btsnoop: Work-around underflow case #01163329
|
||||
@ -477,5 +477,5 @@ index bb0bccf0dd01..12f960ec353d 100644
|
||||
|
||||
*index = 0;
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (bluez-5.77.tar.xz) = cf0faba4ddbfe6cc3c2d86cbd809483ed82327cbd7e4970ef53cf19053de7b355a505cab88844aebe7a6aa1947ec7a366250d3cbf48cf309db413d287289ff99
|
||||
SHA512 (bluez-5.83.tar.xz) = d2ab04e5d2458249964305c991c5d0c1678d24927019e5b6e10d2f8e1350e3f7d7c783fd3770874dc621a699171b68de6678bead1dcb6e6e73c9863248f26aaa
|
||||
|
||||
@ -1,81 +0,0 @@
|
||||
From fdcde2ce2112df852ab3df6e49b158621177f946 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 27 Nov 2024 12:49:52 +0100
|
||||
Subject: [PATCH 1/2] profiles/audio: Quiet plug-in warnings
|
||||
|
||||
A normal daemon start should not throw warnings on a system in the
|
||||
default configuration. Quiet the plug-in warnings that require
|
||||
experimental features to be enabled. They will still appear in the debug
|
||||
output.
|
||||
|
||||
bluetoothd[896]: profiles/audio/micp.c:micp_init() D-Bus experimental not enabled
|
||||
---
|
||||
profiles/audio/media.c | 2 +-
|
||||
profiles/audio/micp.c | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/profiles/audio/media.c b/profiles/audio/media.c
|
||||
index 746e538fcacd..062475e56c49 100644
|
||||
--- a/profiles/audio/media.c
|
||||
+++ b/profiles/audio/media.c
|
||||
@@ -1249,7 +1249,7 @@ static bool endpoint_init_pac(struct media_endpoint *endpoint, uint8_t type,
|
||||
char *name;
|
||||
|
||||
if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) {
|
||||
- warn("D-Bus experimental not enabled");
|
||||
+ DBG("D-Bus experimental not enabled");
|
||||
*err = -ENOTSUP;
|
||||
return false;
|
||||
}
|
||||
diff --git a/profiles/audio/micp.c b/profiles/audio/micp.c
|
||||
index 452027c75da2..3f0845dcb328 100644
|
||||
--- a/profiles/audio/micp.c
|
||||
+++ b/profiles/audio/micp.c
|
||||
@@ -318,7 +318,7 @@ static unsigned int micp_id;
|
||||
static int micp_init(void)
|
||||
{
|
||||
if (!(g_dbus_get_flags() & G_DBUS_FLAG_ENABLE_EXPERIMENTAL)) {
|
||||
- warn("D-Bus experimental not enabled");
|
||||
+ DBG("D-Bus experimental not enabled");
|
||||
return -ENOTSUP;
|
||||
}
|
||||
|
||||
--
|
||||
2.49.0
|
||||
|
||||
|
||||
From 252883241228f3149566f119336ce2c49a8d861e Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 27 Nov 2024 12:49:53 +0100
|
||||
Subject: [PATCH 2/2] plugin: Quiet start-up warnings
|
||||
|
||||
It's not an error for a plug-in not to start if the hardware doesn't
|
||||
support it. Quiet the warnings that require specific hardware.
|
||||
The messages will still appear in the debug output.
|
||||
|
||||
bluetoothd[896]: src/plugin.c:plugin_init() System does not support csip plugin
|
||||
bluetoothd[896]: src/plugin.c:plugin_init() System does not support micp plugin
|
||||
bluetoothd[896]: src/plugin.c:plugin_init() System does not support vcp plugin
|
||||
bluetoothd[896]: src/plugin.c:plugin_init() System does not support mcp plugin
|
||||
bluetoothd[896]: src/plugin.c:plugin_init() System does not support bass plugin
|
||||
bluetoothd[896]: src/plugin.c:plugin_init() System does not support bap plugin
|
||||
---
|
||||
src/plugin.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/plugin.c b/src/plugin.c
|
||||
index e6d05be4ce08..00d3d7b6a0b5 100644
|
||||
--- a/src/plugin.c
|
||||
+++ b/src/plugin.c
|
||||
@@ -50,7 +50,7 @@ static int init_plugin(const struct bluetooth_plugin_desc *desc)
|
||||
err = desc->init();
|
||||
if (err < 0) {
|
||||
if (err == -ENOSYS || err == -ENOTSUP)
|
||||
- warn("System does not support %s plugin",
|
||||
+ DBG("System does not support %s plugin",
|
||||
desc->name);
|
||||
else
|
||||
error("Failed to init %s plugin",
|
||||
--
|
||||
2.49.0
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From bdf5fd2a0156e9070e1e55777b4a71033160fbf1 Mon Sep 17 00:00:00 2001
|
||||
From 36acca0e4f94bb926b16c2fe4536d416cdbf43e6 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Wed, 17 Jul 2024 12:37:16 +0200
|
||||
Subject: [PATCH 1/8] sdp: Ensure size doesn't overflow
|
||||
@ -38,10 +38,10 @@ index 411a95b8a7d3..8a15ad803db1 100644
|
||||
sent += n;
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 062c998fb5c407bc09d6124324b1bd393997bfee Mon Sep 17 00:00:00 2001
|
||||
From 70c6433630f168d46af905f3721663f8db475558 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 18 Jul 2024 15:43:35 +0200
|
||||
Subject: [PATCH 2/8] tools/isotest: Ensure ret doesn't overflow
|
||||
@ -73,10 +73,10 @@ index 2cac0e49cc39..0805faa66e47 100644
|
||||
ret += len;
|
||||
usleep(1000);
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 122a888962765010162306f19fccf77333e1bc1b Mon Sep 17 00:00:00 2001
|
||||
From ce244bd2d24e95017df2e1dea6c3e90a662d05da Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Thu, 18 Jul 2024 15:45:47 +0200
|
||||
Subject: [PATCH 3/8] health: mcap: Ensure sent doesn't overflow
|
||||
@ -108,10 +108,10 @@ index 2e4214a6984f..b3bf403e74d2 100644
|
||||
sent += n;
|
||||
}
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From fce37c2100a043fce99fbe2e8c8171406b841fae Mon Sep 17 00:00:00 2001
|
||||
From cac8152c9e741c7d7c939bd755c55295338b0a7e Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 19 Jul 2024 11:26:45 +0200
|
||||
Subject: [PATCH 4/8] shared/tester: Add early failure check
|
||||
@ -133,7 +133,7 @@ bluez-5.77/src/shared/tester.c:948:2: overrun-buffer-arg: Calling "tester_monito
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/shared/tester.c b/src/shared/tester.c
|
||||
index 56c8cba6f578..3053025d7945 100644
|
||||
index 371ccacedc66..1086a80363db 100644
|
||||
--- a/src/shared/tester.c
|
||||
+++ b/src/shared/tester.c
|
||||
@@ -945,6 +945,8 @@ static bool test_io_send(struct io *io, void *user_data)
|
||||
@ -146,10 +146,10 @@ index 56c8cba6f578..3053025d7945 100644
|
||||
|
||||
g_assert_cmpint(len, ==, iov->iov_len);
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 5078e205d5892048cb1243ce2977dcf8eb0c02fc Mon Sep 17 00:00:00 2001
|
||||
From 916115b8a4aeab9d10a2984a6593d93dcf5a30c2 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Mon, 29 Jul 2024 13:53:41 +0200
|
||||
Subject: [PATCH 5/8] mesh: Fix possible integer overflow
|
||||
@ -170,10 +170,10 @@ X
|
||||
1 file changed, 11 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/mesh/net.c b/mesh/net.c
|
||||
index 05ca48326fc5..ef6a3133859a 100644
|
||||
index cc862dade5ae..2483e23c4229 100644
|
||||
--- a/mesh/net.c
|
||||
+++ b/mesh/net.c
|
||||
@@ -3149,13 +3149,22 @@ static bool send_seg(struct mesh_net *net, uint8_t cnt, uint16_t interval,
|
||||
@@ -3150,13 +3150,22 @@ static bool send_seg(struct mesh_net *net, uint8_t cnt, uint16_t interval,
|
||||
uint32_t seq_num;
|
||||
|
||||
if (msg->segmented) {
|
||||
@ -199,10 +199,10 @@ index 05ca48326fc5..ef6a3133859a 100644
|
||||
/* Send on same seq_num used for Access Layer */
|
||||
seq_num = msg->seqAuth;
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From c37f2cdd4b8fa66fc97d423c4c980865b4793ef2 Mon Sep 17 00:00:00 2001
|
||||
From 51a597594dadb8150348d3a9ecb403db0cc75316 Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 19 Jul 2024 14:27:54 +0200
|
||||
Subject: [PATCH 6/8] shared/gatt-db: Fix possible buffer overrun
|
||||
@ -229,10 +229,10 @@ bluez-5.77/src/shared/gatt-db.c:614:2: overrun-buffer-arg: Overrunning array "va
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/shared/gatt-db.c b/src/shared/gatt-db.c
|
||||
index b35763410d17..cd0eba6bf1d0 100644
|
||||
index 8951079beef1..c990dcd057eb 100644
|
||||
--- a/src/shared/gatt-db.c
|
||||
+++ b/src/shared/gatt-db.c
|
||||
@@ -560,9 +560,14 @@ static int uuid_to_le(const bt_uuid_t *uuid, uint8_t *dst)
|
||||
@@ -566,9 +566,14 @@ static int uuid_to_le(const bt_uuid_t *uuid, uint8_t *dst)
|
||||
return bt_uuid_len(uuid);
|
||||
}
|
||||
|
||||
@ -251,10 +251,10 @@ index b35763410d17..cd0eba6bf1d0 100644
|
||||
|
||||
static bool le_to_uuid(const uint8_t *src, size_t len, bt_uuid_t *uuid)
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From b7cb9a4bc9b94ded15be812d1d444d0ace4a886d Mon Sep 17 00:00:00 2001
|
||||
From 4b38628a0602417a79e50a0d9219e3b8917082de Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 19 Jul 2024 11:29:15 +0200
|
||||
Subject: [PATCH 7/8] shared/btsnoop: Avoid underflowing toread variable
|
||||
@ -297,10 +297,10 @@ index bc5f7fcbe84c..bb0bccf0dd01 100644
|
||||
if (len < 0) {
|
||||
btsnoop->aborted = true;
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
From 354babc88eb98970a9f59056b41854b0f0f87859 Mon Sep 17 00:00:00 2001
|
||||
From bf3eaaef06637a1597e86e03f10c0eb8b3b0139e Mon Sep 17 00:00:00 2001
|
||||
From: Bastien Nocera <hadess@hadess.net>
|
||||
Date: Fri, 19 Jul 2024 15:14:26 +0200
|
||||
Subject: [PATCH 8/8] monitor: Check for possible integer underflow
|
||||
@ -349,5 +349,5 @@ index 009cf15209f0..62857b4b84de 100644
|
||||
|
||||
data->offset += len;
|
||||
--
|
||||
2.45.2
|
||||
2.49.0
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user