linux-bluetooth.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <Andrei.Emeltchenko.news@gmail.com>
To: linux-bluetooth@vger.kernel.org
Subject: [RFCv2 3/7] android/socket: Add error printing possible close() failure
Date: Mon, 25 Nov 2013 13:22:53 +0200	[thread overview]
Message-ID: <1385378577-20503-4-git-send-email-Andrei.Emeltchenko.news@gmail.com> (raw)
In-Reply-To: <1385378577-20503-1-git-send-email-Andrei.Emeltchenko.news@gmail.com>

From: Andrei Emeltchenko <andrei.emeltchenko@intel.com>

---
 android/socket.c | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/android/socket.c b/android/socket.c
index 0885fa2..399590e 100644
--- a/android/socket.c
+++ b/android/socket.c
@@ -96,10 +96,15 @@ static void cleanup_rfsock(struct rfcomm_sock *rfsock)
 	DBG("rfsock: %p fd %d real_sock %d chan %u",
 		rfsock, rfsock->fd, rfsock->real_sock, rfsock->channel);
 
-	if (rfsock->fd > 0)
-		close(rfsock->fd);
-	if (rfsock->real_sock > 0)
-		close(rfsock->real_sock);
+	if (rfsock->fd >= 0)
+		if (close(rfsock->fd) < 0)
+			error("close() fd %d failed: %s", rfsock->fd,
+							strerror(errno));
+
+	if (rfsock->real_sock >= 0)
+		if (close(rfsock->real_sock) < 0)
+			error("close() fd %d: failed: %s", rfsock->real_sock,
+							strerror(errno));
 
 	if (rfsock->rfcomm_watch > 0)
 		if (!g_source_remove(rfsock->rfcomm_watch))
@@ -890,7 +895,10 @@ void bt_sock_handle_cmd(int sk, uint8_t opcode, void *buf, uint16_t len)
 			break;
 
 		ipc_send(sk, HAL_SERVICE_ID_SOCK, opcode, 0, NULL, fd);
-		close(fd);
+
+		if (close(fd) < 0)
+			error("close() fd %d failed: %s", fd, strerror(errno));
+
 		return;
 	case HAL_OP_SOCK_CONNECT:
 		fd = handle_connect(buf);
@@ -898,7 +906,10 @@ void bt_sock_handle_cmd(int sk, uint8_t opcode, void *buf, uint16_t len)
 			break;
 
 		ipc_send(sk, HAL_SERVICE_ID_SOCK, opcode, 0, NULL, fd);
-		close(fd);
+
+		if (close(fd) < 0)
+			error("close() fd %d failed: %s", fd, strerror(errno));
+
 		return;
 	default:
 		DBG("Unhandled command, opcode 0x%x", opcode);
-- 
1.8.3.2


  parent reply	other threads:[~2013-11-25 11:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-11-25 11:22 [RFCv2 0/7] Socket HAL part2 Andrei Emeltchenko
2013-11-25 11:22 ` [RFCv2 1/7] android/socket: Check that create_record function exist Andrei Emeltchenko
2013-11-25 11:22 ` [RFCv2 2/7] android/socket: Use default sec_level for listen Andrei Emeltchenko
2013-11-25 11:22 ` Andrei Emeltchenko [this message]
2013-11-25 11:22 ` [RFCv2 4/7] android/socket: Use security level for connect Andrei Emeltchenko
2013-11-25 11:22 ` [RFCv2 5/7] android/socket: Keep server iochannel reference Andrei Emeltchenko
2013-11-25 11:22 ` [RFCv2 6/7] android/socket: Handle Android events for server socket Andrei Emeltchenko
2013-11-25 11:22 ` [RFCv2 7/7] android/socket: Check create_rfsock returns valid structure Andrei Emeltchenko

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=1385378577-20503-4-git-send-email-Andrei.Emeltchenko.news@gmail.com \
    --to=andrei.emeltchenko.news@gmail.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;
as well as URLs for NNTP newsgroup(s).