public inbox for linux-bluetooth@vger.kernel.org
 help / color / mirror / Atom feed
From: Marcin Kraglak <marcin.kraglak@tieto.com>
To: linux-bluetooth@vger.kernel.org
Subject: [PATCH 4/8] android/gatt: Fix check for permissions error
Date: Thu, 17 Jul 2014 10:42:46 +0200	[thread overview]
Message-ID: <1405586570-16851-4-git-send-email-marcin.kraglak@tieto.com> (raw)
In-Reply-To: <1405586570-16851-1-git-send-email-marcin.kraglak@tieto.com>

If error is returned from check_device_permissions, fill response
data and return. In case of read errors we didn't send error response.
Zero length data was send instead.
---
 android/gatt.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/android/gatt.c b/android/gatt.c
index 4cd94b8..002592c 100644
--- a/android/gatt.c
+++ b/android/gatt.c
@@ -4508,8 +4508,11 @@ static void read_requested_attributes(void *data, void *user_data)
 	error = check_device_permissions(process_data->device,
 							process_data->opcode,
 							permissions);
-	if (error)
-		goto done;
+	if (error != 0) {
+		resp_data->error = error;
+		resp_data->state = REQUEST_DONE;
+		return;
+	}
 
 	resp_data->state = REQUEST_PENDING;
 
@@ -4517,12 +4520,9 @@ static void read_requested_attributes(void *data, void *user_data)
 						resp_data->offset,
 						process_data->opcode,
 						&process_data->device->bdaddr,
-						&value, &value_len)) {
+						&value, &value_len))
 		error = ATT_ECODE_UNLIKELY;
-		goto done;
-	}
 
-done:
 	/* We have value here already if no callback will be called */
 	if (value_len > 0)
 		fill_gatt_response(resp_data, resp_data->handle,
-- 
1.9.0


  parent reply	other threads:[~2014-07-17  8:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-07-17  8:42 [PATCH 1/8] android/gatt: Fix service class id of built in gatt services Marcin Kraglak
2014-07-17  8:42 ` [PATCH 2/8] attrib: Fix discovering descriptors Marcin Kraglak
2014-07-17  8:42 ` [PATCH 3/8] android/gatt: Fix searching primary services by uuids Marcin Kraglak
2014-07-17  8:42 ` Marcin Kraglak [this message]
2014-07-17  8:42 ` [PATCH 5/8] android/gatt: Fix read responses with o length value Marcin Kraglak
2014-07-17  8:42 ` [PATCH 6/8] android/gatt: Add GATT_PERM_NONE define Marcin Kraglak
2014-07-17  8:42 ` [PATCH 7/8] android/gatt: Send proper status of read descriptor callback Marcin Kraglak
2014-07-17  8:42 ` [PATCH 8/8] android/gatt: Fix incorrect status in read characteristic cb Marcin Kraglak
2014-07-18  9:15 ` [PATCH 1/8] android/gatt: Fix service class id of built in gatt services Szymon Janc

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1405586570-16851-4-git-send-email-marcin.kraglak@tieto.com \
    --to=marcin.kraglak@tieto.com \
    --cc=linux-bluetooth@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox