diff --git a/drivers/macintosh/adb.c b/drivers/macintosh/adb.c
index 73b39618903977bed1c4d92c93fecd0680653c8c..afb0942ccc2934dbc7e960622a7ba9f35f2dfac4 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;