summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-01-07 16:04:41 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-28 15:39:05 +0100
commitd83e090023d3f330e08180207a23a3d8add085ee (patch)
tree1c09641d17dead7bb0ab6c5da6dab5fdcba1ffe8
parente9f0fc098c98cf2022952cf1a0f6f032f7b3718f (diff)
cmd64x: potential buffer overflow in cmd64x_program_timings()
[ 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 <dan.carpenter@oracle.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/ide/cmd64x.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index b127ed60c733..9dde8390da09 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -65,6 +65,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);
/*