diff options
| author | Artem Rakhov <arakhov@chromium.org> | 2014-06-30 12:58:46 -0700 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2014-06-30 22:15:40 +0200 |
| commit | c3db771dfddef948bc5346c94e5e0f519857eff6 (patch) | |
| tree | 3e0d89ebb05876bd77fd03d1374dbc2d05bf21b8 /src/sdpd-server.c | |
| parent | 9c7feeb264bd9dcb95792e8ffcbf75c662ff3195 (diff) | |
| download | bluez-c3db771dfddef948bc5346c94e5e0f519857eff6.tar.gz | |
sdp: Fix requests with invalid size
This patch fixes processing of SDP requests which have wrong PDU size in header.
Every SDP request consists of two parts: header and data.
Header always contains 3 values: request code (identifies it's type),
transaction ID (in order to match response with request), and data's size.
According to Bluetooth specification, when the data's size is wrong,
SDP server should return SDP_ErrorResponse with "Invalid PDU Size" parameter.
But now the server doesn't respond at all, and corresponding socket on
client's side crashes.
The patch actually reverts commit 388761cdc8f8a1293bb0b1a5bd576b5fb41616ca,
because the size of request should be checked inside handle_request() function
in order to be able to respond with SDP_ErrorResponse, instead of stopping
the connection.
Diffstat (limited to 'src/sdpd-server.c')
| -rw-r--r-- | src/sdpd-server.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/sdpd-server.c b/src/sdpd-server.c index b411abef3..015551dfc 100644 --- a/src/sdpd-server.c +++ b/src/sdpd-server.c @@ -176,7 +176,11 @@ static gboolean io_session_event(GIOChannel *chan, GIOCondition cond, gpointer d return TRUE; len = recv(sk, buf, size, 0); - if (len != size) { + /* Check here only that the received message is not empty. + * Incorrect length of message should be processed later + * inside handle_request() in order to produce ErrorResponse. + */ + if (len <= 0) { sdp_svcdb_collect_all(sk); free(buf); return FALSE; |