From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752412AbdITXlN (ORCPT <rfc822;w@1wt.eu>);
        Wed, 20 Sep 2017 19:41:13 -0400
Received: from userp1040.oracle.com ([156.151.31.81]:51654 "EHLO
        userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752120AbdITXlL (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Wed, 20 Sep 2017 19:41:11 -0400
Date: Thu, 21 Sep 2017 02:40:52 +0300
From: Dan Carpenter <dan.carpenter@oracle.com>
To: Colin King <colin.king@canonical.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        Jiri Slaby <jslaby@suse.com>, Ingo Molnar <mingo@kernel.org>,
        kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] tty: vt: keyboard: add range check to kbs->kb_func index
Message-ID: <20170920234052.euqzh6opnn27nxth@mwanda>
References: <20170920213828.5563-1-colin.king@canonical.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20170920213828.5563-1-colin.king@canonical.com>
User-Agent: NeoMutt/20170113 (1.7.2)
X-Source-IP: userv0022.oracle.com [156.151.31.74]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Wed, Sep 20, 2017 at 10:38:28PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> A value outside the range 0..MAX_NR_FUNC-1 in kbs->kb_func will
> cause an array bounds overflow on func_table. Fix this by adding
> a range check.
> 
> Detected by CoverityScan, CID#401961 ("Untrusted array index read")
> 
> Fixes: 079c9534a96d ("vt:tackle kbd_table")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  drivers/tty/vt/keyboard.c | 5 +++++
>  1 file changed, 5 insertions(+)
> 
> diff --git a/drivers/tty/vt/keyboard.c b/drivers/tty/vt/keyboard.c
> index f4166263bb3a..1ecf545a96a8 100644
> --- a/drivers/tty/vt/keyboard.c
> +++ b/drivers/tty/vt/keyboard.c
> @@ -1982,6 +1982,11 @@ int vt_do_kdgkb_ioctl(int cmd, struct kbsentry __user *user_kdgkb, int perm)
>  	kbs->kb_string[sizeof(kbs->kb_string)-1] = '\0';
>  	i = kbs->kb_func;
>  
> +	if (i < 0 || i >= MAX_NR_FUNC) {

kbs->kb_func is an unsigned char and MAX_NR_FUNC is 256 so this check
will never be true.

regards,
dan carpenter