From 7641fc83a9a790b761b0c14852156a6651b7fc34 Mon Sep 17 00:00:00 2001 From: Vinicius Costa Gomes Date: Wed, 10 Aug 2016 19:14:28 -0300 Subject: [PATCH] core: Fix wrong expectations for the return of recv() Since commit b5f34f9420b50 "Bluetooth: Fix bt_sock_recvmsg return value" in the kernel, Bluetooth sockets of type SOCK_SEQPACKET, when read() will return the size of the packet received, which can be larger than the the buffer passed by user space. In this case the problem was causing a disconnection soon after the reception of an SDP request. Reported by: Alban Browaeys --- src/sdpd-server.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sdpd-server.c b/src/sdpd-server.c index c863508df..54de39353 100644 --- a/src/sdpd-server.c +++ b/src/sdpd-server.c @@ -164,7 +164,7 @@ static gboolean io_session_event(GIOChannel *chan, GIOCondition cond, gpointer d } len = recv(sk, &hdr, sizeof(sdp_pdu_hdr_t), MSG_PEEK); - if (len != sizeof(sdp_pdu_hdr_t)) { + if (len < 0 || (unsigned int) len < sizeof(sdp_pdu_hdr_t)) { sdp_svcdb_collect_all(sk); return FALSE; } -- 2.47.3