diff --git a/src/attrib-server.c b/src/attrib-server.c
index 1c088df..351b7fe 100644
--- a/src/attrib-server.c
+++ b/src/attrib-server.c
@@ -987,6 +987,12 @@ static void channel_handler(const uint8_t *ipdu, uint16_t len,
 
 	DBG("op 0x%02x", ipdu[0]);
 
+	if (len > vlen) {
+		error("Too much data on ATT socket");
+		status = ATT_ECODE_INVALID_PDU;
+		goto done;
+	}
+
 	switch (ipdu[0]) {
 	case ATT_OP_READ_BY_GROUP_REQ:
 		length = dec_read_by_grp_req(ipdu, len, &start, &end, &uuid);