Patchwork [for-dylan] bluez4: fix network Connect parameter validation

login
register
mail settings
Submitter Peter Bigot
Date Aug. 21, 2013, 10:47 p.m.
Message ID <1377125231-23508-1-git-send-email-pab@pabigot.com>
Download mbox | patch
Permalink /patch/56133/
State New
Headers show

Comments

Peter Bigot - Aug. 21, 2013, 10:47 p.m.
From: "Peter A. Bigot" <pab@pabigot.com>

The incorrect validation prevents connection to the NAP service on another
device.

Signed-off-by: Peter A. Bigot <pab@pabigot.com>
---
 ...ork-fix-network-Connect-method-parameters.patch |   30 ++++++++++++++++++++
 meta/recipes-connectivity/bluez/bluez4_4.101.bb    |    3 +-
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
Ross Burton - Aug. 22, 2013, 9:46 a.m.
On 21 August 2013 23:47, Peter A. Bigot <pab@pabigot.com> wrote:
> The incorrect validation prevents connection to the NAP service on another
> device.

Is this intended for master as well as dylan?

Ross
Peter Bigot - Aug. 22, 2013, 11:53 a.m.
On 08/22/2013 04:46 AM, Burton, Ross wrote:
> On 21 August 2013 23:47, Peter A. Bigot <pab@pabigot.com> wrote:
>> The incorrect validation prevents connection to the NAP service on another
>> device.
> Is this intended for master as well as dylan?

At the moment, no.  I have not been actively developing under master yet 
so have not tested it there.

However, if Yocto 1.5 will still provide bluez4-101 (which was the last 
bluez4 release) the patch will be needed.  I thought there was some 
discussion of moving to bluez5 with a compatibility layer (again which I 
have not personally tested).

Peter
Peter Bigot - Aug. 28, 2013, 11:10 a.m.
On 08/22/2013 06:53 AM, Peter A. Bigot wrote:
> On 08/22/2013 04:46 AM, Burton, Ross wrote:
>> On 21 August 2013 23:47, Peter A. Bigot <pab@pabigot.com> wrote:
>>> The incorrect validation prevents connection to the NAP service on 
>>> another
>>> device.
>> Is this intended for master as well as dylan?
>
> At the moment, no.  I have not been actively developing under master 
> yet so have not tested it there.

I am now on master and verified the patch is required.  I've submitted a 
slight variant for master that does not increment PR.

Peter

Patch

diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch b/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
new file mode 100644
index 0000000..37f9199
--- /dev/null
+++ b/meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch
@@ -0,0 +1,30 @@ 
+Upstream-Status: Backport
+Signed-off-by: Peter A. Bigot <pab@pabigot.com>
+
+From 57170b311f1468330f4a9961dc0b3ac45f97bc13 Mon Sep 17 00:00:00 2001
+From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
+Date: Sat, 30 Jun 2012 00:39:05 -0300
+Subject: [PATCH] network: fix network Connect() method parameters
+
+---
+ network/connection.c |    4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/network/connection.c b/network/connection.c
+index 544ec3a..59423a9 100644
+--- a/network/connection.c
++++ b/network/connection.c
+@@ -554,7 +554,9 @@ static void path_unregister(void *data)
+ 
+ static const GDBusMethodTable connection_methods[] = {
+ 	{ GDBUS_ASYNC_METHOD("Connect",
+-			NULL, NULL, connection_connect) },
++				GDBUS_ARGS({"uuid", "s"}),
++				GDBUS_ARGS({"interface", "s"}),
++				connection_connect) },
+ 	{ GDBUS_METHOD("Disconnect",
+ 			NULL, NULL, connection_disconnect) },
+ 	{ GDBUS_METHOD("GetProperties",
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
index f48adfd..ab59075 100644
--- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb
+++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb
@@ -1,11 +1,12 @@ 
 require bluez4.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI += "file://bluetooth.conf \
             file://sbc_mmx.patch \
             file://fix-udev-paths.patch \
             file://obsolete_automake_macros.patch \
+            file://network-fix-network-Connect-method-parameters.patch \
 "
 
 SRC_URI[md5sum] = "fb42cb7038c380eb0e2fa208987c96ad"