[PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[evermind]

From: Frieder Buerzele <evermind@tuxfamily.org>

---
 gdbus/object.c |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gdbus/object.c b/gdbus/object.c
index 0786aeb..d920eac 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -224,11 +224,12 @@ static struct interface_data *find_interface(GSList *interfaces,
 {
 	GSList *list;
 
-	for (list = interfaces; list; list = list->next) {
-		struct interface_data *iface = list->data;
-		if (!strcmp(name, iface->name))
-			return iface;
-	}
+	if (name)
+		for (list = interfaces; list; list = list->next) {
+			struct interface_data *iface = list->data;
+			if (!strcmp(name, iface->name))
+				return iface;
+		}
 
 	return NULL;
 }
-- 
1.5.6.3

Re: [PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[Marcel Holtmann]

Hi Frieder,

> ---
>  gdbus/object.c |   11 ++++++-----
>  1 files changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/gdbus/object.c b/gdbus/object.c
> index 0786aeb..d920eac 100644
> --- a/gdbus/object.c
> +++ b/gdbus/object.c
> @@ -224,11 +224,12 @@ static struct interface_data *find_interface(GSList *interfaces,
>  {
>  	GSList *list;
>  
> -	for (list = interfaces; list; list = list->next) {
> -		struct interface_data *iface = list->data;
> -		if (!strcmp(name, iface->name))
> -			return iface;
> -	}
> +	if (name)
> +		for (list = interfaces; list; list = list->next) {
> +			struct interface_data *iface = list->data;
> +			if (!strcmp(name, iface->name))
> +				return iface;
> +		}
>  
>  	return NULL;
>  }

what about something like this:

	if (name == NULL)
		return NULL;

Regards

Marcel

Re: [PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[Frieder Buerzele]

Hi Frieder,

> > ---
> >  gdbus/object.c |   11 ++++++-----
> >  1 files changed, 6 insertions(+), 5 deletions(-)
> > 
> > diff --git a/gdbus/object.c b/gdbus/object.c
> > index 0786aeb..d920eac 100644
> > --- a/gdbus/object.c
> > +++ b/gdbus/object.c
> > @@ -224,11 +224,12 @@ static struct interface_data
> > *find_interface(GSList *interfaces,
> >  {
> >  	GSList *list;
> >  
> > -	for (list = interfaces; list; list = list->next) {
> > -		struct interface_data *iface = list->data;
> > -		if (!strcmp(name, iface->name))
> > -			return iface;
> > -	}
> > +	if (name)
> > +		for (list = interfaces; list; list = list->next) {
> > +			struct interface_data *iface = list->data;
> > +			if (!strcmp(name, iface->name))
> > +				return iface;
> > +		}
> >  
> >  	return NULL;
> >  }
> 
> what about something like this:
> 
> 	if (name == NULL)
> 			return NULL;
> 
> 			Regards
> 
> 			Marcel
> 

k, I'll resend a updated patch

Greetz Frieder

[PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[Frieder Buerzele]

---
 gdbus/object.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gdbus/object.c b/gdbus/object.c
index 0786aeb..7bc9860 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -222,6 +222,9 @@ static void generic_unregister(DBusConnection *connection, void *user_data)
 static struct interface_data *find_interface(GSList *interfaces,
 						const char *name)
 {
+	if (NULL == name)
+		return NULL;
+
 	GSList *list;
 
 	for (list = interfaces; list; list = list->next) {
-- 
1.5.6.3

Re: [PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[Frieder Buerzele]

> > Hi Frieder,
> >
> > > ---
> > >  gdbus/object.c |   11 ++++++-----
> > >  1 files changed, 6 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/gdbus/object.c b/gdbus/object.c
> > > index 0786aeb..d920eac 100644
> > > --- a/gdbus/object.c
> > > +++ b/gdbus/object.c
> > > @@ -224,11 +224,12 @@ static struct interface_data
> > > *find_interface(GSList *interfaces,
> > >  {
> > >  	GSList *list;
> > >  
> > > -	for (list = interfaces; list; list = list->next) {
> > > -		struct interface_data *iface = list->data;
> > > -		if (!strcmp(name, iface->name))
> > > -			return iface;
> > > -	}
> > > +	if (name)
> > > +		for (list = interfaces; list; list = list->next) {
> > > +			struct interface_data *iface = list->data;
> > > +			if (!strcmp(name, iface->name))
> > > +				return iface;
> > > +		}
> > >  
> > >  	return NULL;
> > >  }
> > 
> > what about something like this:
> > 
> > 	if (name == NULL)
> > 			return NULL;
> > 
> > 			Regards
> > 
> > 			Marcel
> > 
> 
> k, I'll resend a updated patch
> 
> Greetz Frieder

just forget to test compile the patch, here is the "fixed" fix patch

Greetz Frieder

[PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[Frieder Buerzele]

---
 gdbus/object.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/gdbus/object.c b/gdbus/object.c
index 0786aeb..dde654b 100644
--- a/gdbus/object.c
+++ b/gdbus/object.c
@@ -224,6 +224,9 @@ static struct interface_data *find_interface(GSList *interfaces,
 {
 	GSList *list;
 
+	if (NULL == name)
+		return NULL;
+
 	for (list = interfaces; list; list = list->next) {
 		struct interface_data *iface = list->data;
 		if (!strcmp(name, iface->name))
-- 
1.5.6.3

Re: [PATCH] Fix segfault: If the interface name is NULL the bluetoothd daemon will crash

[Marcel Holtmann]

Hi Frieder,

> diff --git a/gdbus/object.c b/gdbus/object.c
> index 0786aeb..dde654b 100644
> --- a/gdbus/object.c
> +++ b/gdbus/object.c
> @@ -224,6 +224,9 @@ static struct interface_data *find_interface(GSList *interfaces,
>  {
>  	GSList *list;
>  
> +	if (NULL == name)
> +		return NULL;
> +
>  	for (list = interfaces; list; list = list->next) {
>  		struct interface_data *iface = list->data;
>  		if (!strcmp(name, iface->name))

a similar patch has been applied to bluez, obexd and connmand. Thanks.

Regards

Marcel