From: Ning Qiang <sohu0106@126.com>
Date: Wed, 13 Jul 2022 15:37:34 +0000 (+0800)
Subject: macintosh/adb: fix oob read in do_adb_query() function
X-Git-Tag: v6.6.17~6858^2~86
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fd97e4ad6d3b0c9fce3bca8ea8e6969d9ce7423b;p=platform%2Fkernel%2Flinux-rpi.git

macintosh/adb: fix oob read in do_adb_query() function

In do_adb_query() function of drivers/macintosh/adb.c, req->data is copied
form userland. The parameter "req->data[2]" is missing check, the array
size of adb_handler[] is 16, so adb_handler[req->data[2]].original_address and
adb_handler[req->data[2]].handler_id will lead to oob read.

Cc: stable <stable@kernel.org>
Signed-off-by: Ning Qiang <sohu0106@126.com>
Reviewed-by: Kees Cook <keescook@chromium.org>
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20220713153734.2248-1-sohu0106@126.com
---

diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 439fab4..1bbb9ca 100644
--- a/drivers/macintosh/adb.c
+++ b/drivers/macintosh/adb.c
@@ -647,7 +647,7 @@ do_adb_query(struct adb_request *req)
 
 	switch(req->data[1]) {
 	case ADB_QUERY_GETDEVINFO:
-		if (req->nbytes < 3)
+		if (req->nbytes < 3 || req->data[2] >= 16)
 			break;
 		mutex_lock(&adb_handler_mutex);
 		req->reply[0] = adb_handler[req->data[2]].original_address;