[PATCH] AVDTP Qualification: Fix error handling for AVDTP set configuration command

[PATCH] AVDTP Qualification: Fix error handling for AVDTP set configuration command

[Nick Pelly]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0005-AVDTP-Qualification-Fix-error-handling-for-AVDTP-se.patch --]
[-- Type: text/x-patch, Size: 1373 bytes --]

From 2caee7eb2f475a932fc7594f4c0beaf26a67d4f7 Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Thu, 26 Mar 2009 16:23:25 -0700
Subject: [PATCH] AVDTP Qualification: Fix error handling for AVDTP set configuration command.

---
 audio/avdtp.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/audio/avdtp.c b/audio/avdtp.c
index 297b578..8e38ccd 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -1200,6 +1200,7 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
 	uint8_t err, category = 0x00;
 	struct audio_device *dev;
 	bdaddr_t src, dst;
+	GSList *l;
 
 	if (size < sizeof(struct setconf_req)) {
 		error("Too short getcap request");
@@ -1247,6 +1248,16 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
 					size - sizeof(struct setconf_req),
 					&stream->codec);
 
+	/* Verify that the Media Transport capability's length = 0. Reject otherwise */
+	for (l = stream->caps; l != NULL; l = g_slist_next(l)) {
+		struct avdtp_service_capability *cap = l->data;
+
+		if ((cap->category == AVDTP_MEDIA_TRANSPORT) && (cap->length != 0)) {
+			err = AVDTP_BAD_MEDIA_TRANSPORT_FORMAT;
+			goto failed;
+		}
+	}
+
 	if (sep->ind && sep->ind->set_configuration) {
 		if (!sep->ind->set_configuration(session, sep, stream,
 							stream->caps, &err,
-- 
1.5.5

Re: [PATCH] AVDTP Qualification: Fix error handling for AVDTP set configuration command

[Marcel Holtmann]

Hi Nick,

> +
> +               if ((cap->category == AVDTP_MEDIA_TRANSPORT) &&
> (cap->length != 0)) {
> +                       err = AVDTP_BAD_MEDIA_TRANSPORT_FORMAT;
> +                       goto failed;

no need to put brackets around cap->cat == ... check etc. The comparison
takes precedence over &&. Please fix and re-send the patch.

Regards

Marcel

Re: [PATCH] AVDTP Qualification: Fix error handling for AVDTP set configuration command

[Nick Pelly]

[-- Attachment #1: Type: text/plain, Size: 432 bytes --]

On 3/25/09, Marcel Holtmann <marcel@holtmann.org> wrote:
> Hi Nick,
>
>  > +
>  > +               if ((cap->category == AVDTP_MEDIA_TRANSPORT) &&
>  > (cap->length != 0)) {
>  > +                       err = AVDTP_BAD_MEDIA_TRANSPORT_FORMAT;
>  > +                       goto failed;
>
>  no need to put brackets around cap->cat == ... check etc. The comparison
>  takes precedence over &&. Please fix and re-send the patch.

fixed

[-- Attachment #2: 0005-AVDTP-Qualification-Fix-error-handling-for-AVDTP-se.patch --]
[-- Type: text/x-patch, Size: 1369 bytes --]

From f0d527062359212c3506bf2090829406cfd15f0e Mon Sep 17 00:00:00 2001
From: Nick Pelly <npelly@google.com>
Date: Thu, 26 Mar 2009 16:23:25 -0700
Subject: [PATCH] AVDTP Qualification: Fix error handling for AVDTP set configuration command.

---
 audio/avdtp.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/audio/avdtp.c b/audio/avdtp.c
index 297b578..7764369 100644
--- a/audio/avdtp.c
+++ b/audio/avdtp.c
@@ -1200,6 +1200,7 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
 	uint8_t err, category = 0x00;
 	struct audio_device *dev;
 	bdaddr_t src, dst;
+	GSList *l;
 
 	if (size < sizeof(struct setconf_req)) {
 		error("Too short getcap request");
@@ -1247,6 +1248,16 @@ static gboolean avdtp_setconf_cmd(struct avdtp *session, uint8_t transaction,
 					size - sizeof(struct setconf_req),
 					&stream->codec);
 
+	/* Verify that the Media Transport capability's length = 0. Reject otherwise */
+	for (l = stream->caps; l != NULL; l = g_slist_next(l)) {
+		struct avdtp_service_capability *cap = l->data;
+
+		if (cap->category == AVDTP_MEDIA_TRANSPORT && cap->length != 0) {
+			err = AVDTP_BAD_MEDIA_TRANSPORT_FORMAT;
+			goto failed;
+		}
+	}
+
 	if (sep->ind && sep->ind->set_configuration) {
 		if (!sep->ind->set_configuration(session, sep, stream,
 							stream->caps, &err,
-- 
1.5.5