DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3E48420869
Date:   Tue, 16 Oct 2018 23:20:40 +0300
From:   Matias Karhumaa <matias.karhumaa@gmail.com>
To:     linux-bluetooth@vger.kernel.org
Subject: [PATCH 03/12] btmon: fix segfault caused by buffer over-read
Message-ID: <20181016202040.GA85000@Matias-MacBook-Air.local>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.6.1 (2016-04-27)
Sender: linux-bluetooth-owner@vger.kernel.org
Precedence: bulk

Fix segfault caused by buffer over-read in packet_hci_scodata function
of monitor/packet.c.

Fix is to check that index is not bigger than MAX_INDEX.

This bug was found by fuzzing with AFL.
---
 monitor/packet.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/monitor/packet.c b/monitor/packet.c
index 3e2a08a1c..fb6d7e46c 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -10170,6 +10170,11 @@ void packet_hci_scodata(struct timeval *tv, struct ucred *cred, uint16_t index,
 	uint8_t flags = acl_flags(handle);
 	char handle_str[16], extra_str[32];
 
+	if (index > MAX_INDEX) {
+		print_field("Invalid index (%d).", index);
+		return;
+	}
+
 	index_list[index].frame++;
 
 	if (size < HCI_SCO_HDR_SIZE) {
-- 
2.17.1