Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4457559ybz; Tue, 28 Apr 2020 11:37:13 -0700 (PDT) X-Google-Smtp-Source: APiQypJOMTShXYPUel3eIM4a30/f2ImDDJEzSsiAE6BnvyTIk/xWsh4s3+wfo/UNe5NhV8Xttdfl X-Received: by 2002:a05:6402:1768:: with SMTP id da8mr24169545edb.216.1588099033404; Tue, 28 Apr 2020 11:37:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099033; cv=none; d=google.com; s=arc-20160816; b=w6ew3wi5MXtuVenLiGFKTThWGKX4xPzgvVMJsx8XEhTsDuAWnf02q+YD0wsEZ8NO7N 0xNlyt85obw6p4YUeyecE6kZ+PpTzM0fRu4G3lw/HGofVF8U8ca7ase+hX+XmJU8gpWd KD4Yr4DKfFcFXzhYtTKduAmVsM75EJ48qCJ/kMhVg9KRWtXUHP1Vr0VuOop2vGRyIQoC 2bKRYq7/UQzyyd+pJUscoUfNihoxwb3ZWHlmVrHiSgX1wLPKetdMOZnw1xTpazKOvXo9 pxeoSIwGiIK9G41iSZZ/nWaf2M5DWJZnwP3egH4Gp1ycHJSCqvmjCEmGux3bU6LK1+JI uWtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=J7KyW6MBEglV8O9x2o3UPIQf9JY2nAXeDZlEVvrZzZc=; b=IoylA5Y21sZI91yaBUKoed8eR+dAic5RJYFWTOgLvKREK3oAyqehbi0JOT7cEAsX1l ZE2pje+IUZFjnAAP/JTX43mLUKnbxtf0mtdGDeNZVjF7ArCmUJjKMWQ5nG9YLU+4vym7 vHZro5O15ub7irN3Blw++W4t/8+Qv/WhKSFouvaLynMcBHgMEbrO/e71j5bPQvYX6wEk FUf0jMqmp2wgvHXs3yydvU68BnYj6jdhABvT/yZ7BE0wEwBOkDcCGVG1oqKcOOISO7BH FqPRQUT5uMqUVJHWdIguOwD/B5GO+6tljOmsGTZ1UlP3+PUJ6P2HUgpp53HzVsjtoL7x Gbmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FnC0tzq2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id e21si2138175edq.508.2020.04.28.11.36.50; Tue, 28 Apr 2020 11:37:13 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=FnC0tzq2; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729977AbgD1Sdp (ORCPT + 99 others); Tue, 28 Apr 2020 14:33:45 -0400 Received: from mail.kernel.org ([198.145.29.99]:50252 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729972AbgD1Sdm (ORCPT ); Tue, 28 Apr 2020 14:33:42 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id D7DD42085B; Tue, 28 Apr 2020 18:33:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098822; bh=3+ofRS7RE8FekExK6l1Hstl3mc2F4usOKMv2qO5BNHQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FnC0tzq24L4giuQpDVL0mucAUt8DlcRAyHKsjuCHnwolIT560zqyXdegSNmHdu6EW xwoFSTWM9Xa/nnqvgfAbaaPwsSkSW9OKG6G6iQHQ1yjRKa45NwvwWN0nApKVF0cqM/ fwWzPOP2OfKO+N/KLuu3qxnjZZum0u7Wr0d0x1Hg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jiri Slaby Subject: [PATCH 5.6 116/167] tty: rocket, avoid OOB access Date: Tue, 28 Apr 2020 20:24:52 +0200 Message-Id: <20200428182239.903525901@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182225.451225420@linuxfoundation.org> References: <20200428182225.451225420@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jiri Slaby commit 7127d24372bf23675a36edc64d092dc7fd92ebe8 upstream. init_r_port can access pc104 array out of bounds. pc104 is a 2D array defined to have 4 members. Each member has 8 submembers. * we can have more than 4 (PCI) boards, i.e. [board] can be OOB * line is not modulo-ed by anything, so the first line on the second board can be 4, on the 3rd 12 or alike (depending on previously registered boards). It's zero only on the first line of the first board. So even [line] can be OOB, quite soon (with the 2nd registered board already). This code is broken for ages, so just avoid the OOB accesses and don't try to fix it as we would need to find out the correct line number. Use the default: RS232, if we are out. Generally, if anyone needs to set the interface types, a module parameter is past the last thing that should be used for this purpose. The parameters' description says it's for ISA cards anyway. Signed-off-by: Jiri Slaby Cc: stable Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Link: https://lore.kernel.org/r/20200417105959.15201-2-jslaby@suse.cz Signed-off-by: Greg Kroah-Hartman Signed-off-by: Greg Kroah-Hartman --- drivers/tty/rocket.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) --- a/drivers/tty/rocket.c +++ b/drivers/tty/rocket.c @@ -632,18 +632,21 @@ init_r_port(int board, int aiop, int cha tty_port_init(&info->port); info->port.ops = &rocket_port_ops; info->flags &= ~ROCKET_MODE_MASK; - switch (pc104[board][line]) { - case 422: - info->flags |= ROCKET_MODE_RS422; - break; - case 485: - info->flags |= ROCKET_MODE_RS485; - break; - case 232: - default: + if (board < ARRAY_SIZE(pc104) && line < ARRAY_SIZE(pc104_1)) + switch (pc104[board][line]) { + case 422: + info->flags |= ROCKET_MODE_RS422; + break; + case 485: + info->flags |= ROCKET_MODE_RS485; + break; + case 232: + default: + info->flags |= ROCKET_MODE_RS232; + break; + } + else info->flags |= ROCKET_MODE_RS232; - break; - } info->intmask = RXF_TRIG | TXFIFO_MT | SRC_INT | DELTA_CD | DELTA_CTS | DELTA_DSR; if (sInitChan(ctlp, &info->channel, aiop, chan) == 0) {