From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D197BC35641 for ; Fri, 21 Feb 2020 08:13:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A956B24672 for ; Fri, 21 Feb 2020 08:13:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272827; bh=BOAuucgOG9GcK1LGryZaUi2poccOqBLsVdu3ZCwoLF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=nApTTdFAdM6gkhs5jOLrIiZNVr1dgx7lkaqzxP7uM8YBFDJO4JMHrEF7lMzaT6uVq ZQ7NJzgMekcQUwwepc9LLOsLYsx/RMq2Ujg3GKrez4G/NavA+mzDkKhGj53YOZFtAH S23Kt04S/LQV9FanQ5qFg5Ln9Of/SGA8tOPFdhjI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733048AbgBUINq (ORCPT ); Fri, 21 Feb 2020 03:13:46 -0500 Received: from mail.kernel.org ([198.145.29.99]:49970 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732447AbgBUINo (ORCPT ); Fri, 21 Feb 2020 03:13:44 -0500 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 35E8420578; Fri, 21 Feb 2020 08:13:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582272823; bh=BOAuucgOG9GcK1LGryZaUi2poccOqBLsVdu3ZCwoLF8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=km+1WM3tZUHBZ0aKS3V+TiQzw762ZXNrQV6wOedty0UySn4NTA+C5bi6SSDEznYan DdkCPBJlD+8UUz3LoRhaaqyuoZtl2OUjgLqiFy6tHDpIZdl/6y2Uc89xwSSR+6a50e KKh8Q92qtpyGDUIsJH8GIjm6b3wx0jvRKhzD+wRM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , "David S. Miller" , Sasha Levin Subject: [PATCH 5.4 261/344] cmd64x: potential buffer overflow in cmd64x_program_timings() Date: Fri, 21 Feb 2020 08:41:00 +0100 Message-Id: <20200221072413.314603922@linuxfoundation.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200221072349.335551332@linuxfoundation.org> References: <20200221072349.335551332@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: Dan Carpenter [ Upstream commit 117fcc3053606d8db5cef8821dca15022ae578bb ] The "drive->dn" value is a u8 and it is controlled by root only, but it could be out of bounds here so let's check. Signed-off-by: Dan Carpenter Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/ide/cmd64x.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c index a1898e11b04e6..943bf944bf722 100644 --- a/drivers/ide/cmd64x.c +++ b/drivers/ide/cmd64x.c @@ -66,6 +66,9 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode) struct ide_timing t; u8 arttim = 0; + if (drive->dn >= ARRAY_SIZE(drwtim_regs)) + return; + ide_timing_compute(drive, mode, &t, T, 0); /* -- 2.20.1