Ubuntu
bluez package

Merge lp:~mfrey/ubuntu/utopic/bluez/avrcp-fix into lp:ubuntu/utopic/bluez

  1. Utopic (14.10)
  2. avrcp-fix
  3. Merge into utopic
Proposed by Michael Frey
Status: Merged
Approved by: Mathieu Trudel-Lapierre
Approved revision: 118
Merge reported by: Mathieu Trudel-Lapierre
Merged at revision: not available
Proposed branch: lp:~mfrey/ubuntu/utopic/bluez/avrcp-fix
Merge into: lp:ubuntu/utopic/bluez
Diff against target: 54 lines (+34/-0)
3 files modified
debian/changelog (+7/-0)
debian/patches/avrcp.patch (+26/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp:~mfrey/ubuntu/utopic/bluez/avrcp-fix
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+225480@code.launchpad.net

Commit message

Fix for de-reference pdu parameter.

Description of the change

Fix for de-reference pdu parameter.

To post a comment you must log in.
lp:~mfrey/ubuntu/utopic/bluez/avrcp-fix updated
118. By Michael Frey <michael@michael-MacBookAir>

Added comments to the patch.

Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote :

ltgm!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-05-28 10:39:11 +0000
3+++ debian/changelog 2014-07-03 14:34:30 +0000
4@@ -1,3 +1,10 @@
5+bluez (4.101-0ubuntu16) UNRELEASED; urgency=medium
6+
7+ * debian/patches/avrcp.patch
8+ Fix for de-reference pdu parameter.
9+
10+ -- Michael Frey <michael.frey@canonical.com> Thu, 03 Jul 2014 09:59:58 -0400
11+
12 bluez (4.101-0ubuntu15) utopic; urgency=high
13
14 * No change rebuild against new dh_installinit, to call update-rc.d at
15
16=== added file 'debian/patches/avrcp.patch'
17--- debian/patches/avrcp.patch 1970-01-01 00:00:00 +0000
18+++ debian/patches/avrcp.patch 2014-07-03 14:34:30 +0000
19@@ -0,0 +1,26 @@
20+From: Michael Frey <michael.frey@canonical.com>
21+Subject: Fix for BUS Signal when de-referenceing the pdu pointer.
22+
23+This patch fixes avrcp when the remote connection sends attributes via pdu. Before this, referencing the identifier would cause a BUS signal and crash bluetoothd.
24+
25+
26+Index: bluez/audio/avrcp.c
27+===================================================================
28+--- bluez.orig/audio/avrcp.c 2014-07-03 09:46:38.972887000 -0400
29++++ bluez/audio/avrcp.c 2014-07-03 09:58:04.292191071 -0400
30+@@ -662,13 +662,13 @@
31+ uint8_t transaction)
32+ {
33+ uint16_t len = ntohs(pdu->params_len);
34+- uint64_t *identifier = (uint64_t *) &pdu->params[0];
35++ uint64_t identifier = bt_get_le64(&pdu->params[0]);
36+ uint16_t pos;
37+ uint8_t nattr;
38+ GList *attr_ids;
39+ uint16_t offset;
40+
41+- if (len < 9 || *identifier != 0)
42++ if (len < 9 || identifier != 0)
43+ goto err;
44+
45+ nattr = pdu->params[8];
46
47=== modified file 'debian/patches/series'
48--- debian/patches/series 2014-04-08 10:54:11 +0000
49+++ debian/patches/series 2014-07-03 14:34:30 +0000
50@@ -16,3 +16,4 @@
51 telephony_ofono_add_watch.patch
52 12_check_device_before_removing_from_devices.patch
53 13_reset_default_adapter_id.patch
54+avrcp.patch

Subscribers

People subscribed via source and target branches

to all changes: