Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp2996365imu; Mon, 19 Nov 2018 09:08:19 -0800 (PST) X-Google-Smtp-Source: AJdET5dUrK4FkQ8XdCIob6JQokZDA14MbYhIM0Q0vDZK1i1ZTl/Gzbs+WWeeZlM+jKFNF5qSMbFA X-Received: by 2002:a17:902:8a89:: with SMTP id p9-v6mr23580818plo.183.1542647299036; Mon, 19 Nov 2018 09:08:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1542647299; cv=none; d=google.com; s=arc-20160816; b=xPZOOc+v7ip12ACmH7+d4BCPUOpA4JqSEReVzMVhT7HUjDKByf+DYONjdSRur24LrC 7tLD5AT0QsvLNTIKguSMUEwoesxeULRXBsCCLQlYhP4oA4jYI1iPqvgWPcEW8LJs/ypi OcEYDhj081LKw7pNcSJg46rKSnoP0AeW1yeW3vVPC2Ec5FZDH6YfLXMLhS08zZYIXr5b AgV6vjFIoa5TDZTM7XT1mrTxrkNQchrSNFFXZeqrUhyGQSjXmkyuAkivqNH0hFodHIEL BQeIpR1z4Xk2LlPhbD77t/IqGA0EZyEsTSvslKzMsODnJZrFAslHIQ5P+kdzdwsuNqAF MX0Q== 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=XuylGvcPfDQyvV7ESXrX9TGlHq6CUOk+JxyeYhwcntQ=; b=iBAw4j28T0g/IUBfqkOhlPMCc5B10e9RgF1sSBxgAcEDFQ18QEo/F36h+esdVWbktG h+O6suiYMmyLLDFLdvUWMQDJEy/cdWt8bl0CD1iIFv+pzvxo/Y3N9Io0F42Pvv+zd8Ko EAQNHDCp4RRe4zS77VbO5lECZXbbetPMV1IHohJdIrBUhzejwcAJkliDM9wWv9dyLfqG 0zT4Vuxr+sFdF0lSihanA2FMDOlI/gmqItPkGi8WtUu6D645sV4e0ylynRLwpwgF8gEk qmyly85Rs+7FFaBjII/MVGqq3DeU03/31P372AqH9oC7ti69Xak7kaLAzbfDCF0k5EB0 +OfA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RdTF5cFT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d187-v6si44810754pfa.68.2018.11.19.09.08.02; Mon, 19 Nov 2018 09:08:19 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=RdTF5cFT; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2436487AbeKTDbI (ORCPT + 99 others); Mon, 19 Nov 2018 22:31:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:46412 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2405956AbeKTDbG (ORCPT ); Mon, 19 Nov 2018 22:31:06 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 61CB2214ED; Mon, 19 Nov 2018 17:06:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542647208; bh=Ng3O+Fb3cY8Y0Cjxkcrg2eL0Dj9a0tubUecaCBNNcSY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RdTF5cFTT2XSQLbtXQ2KfJ5mv4e5CPcw+0vZ2RI+lR/CpJuYT3w9si6v3qnV/tdLF 3/1t2FiItGAycTUhRnhCApcmZdpqyTrYs07bBUKvIpWyK8OLO5w/VdPf30DFd56JT/ iKJ8NIcabypmtsU7nNY4p4M2wq1NyfPK0SL7lDEE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "H. Peter Anvin (Intel)" , "Cc: Johan Hovold" , Jiri Slaby , Al Viro , Richard Henderson , Ivan Kokshaysky , Matt Turner , Thomas Gleixner , Kate Stewart , Philippe Ombredanne , Eugene Syromiatnikov , Alan Cox Subject: [PATCH 3.18 70/90] termios, tty/tty_baudrate.c: fix buffer overrun Date: Mon, 19 Nov 2018 17:29:52 +0100 Message-Id: <20181119162631.583587377@linuxfoundation.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181119162620.585061184@linuxfoundation.org> References: <20181119162620.585061184@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review 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 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: H. Peter Anvin commit 991a25194097006ec1e0d2e0814ff920e59e3465 upstream. On architectures with CBAUDEX == 0 (Alpha and PowerPC), the code in tty_baudrate.c does not do any limit checking on the tty_baudrate[] array, and in fact a buffer overrun is possible on both architectures. Add a limit check to prevent that situation. This will be followed by a much bigger cleanup/simplification patch. Signed-off-by: H. Peter Anvin (Intel) Requested-by: Cc: Johan Hovold Cc: Jiri Slaby Cc: Al Viro Cc: Richard Henderson Cc: Ivan Kokshaysky Cc: Matt Turner Cc: Thomas Gleixner Cc: Kate Stewart Cc: Philippe Ombredanne Cc: Eugene Syromiatnikov Cc: Alan Cox Cc: stable Signed-off-by: Greg Kroah-Hartman --- drivers/tty/tty_ioctl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --- a/drivers/tty/tty_ioctl.c +++ b/drivers/tty/tty_ioctl.c @@ -327,7 +327,7 @@ speed_t tty_termios_baud_rate(struct kte else cbaud += 15; } - return baud_table[cbaud]; + return cbaud >= n_baud_table ? 0 : baud_table[cbaud]; } EXPORT_SYMBOL(tty_termios_baud_rate); @@ -363,7 +363,7 @@ speed_t tty_termios_input_baud_rate(stru else cbaud += 15; } - return baud_table[cbaud]; + return cbaud >= n_baud_table ? 0 : baud_table[cbaud]; #else return tty_termios_baud_rate(termios); #endif