summaryrefslogtreecommitdiff
path: root/drivers/ide
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-24 10:34:49 +0300
commitaeca4e33904532a6959aadc87a1de59d1e67664c (patch)
tree58b23bdebd39f1180ec45aca275495a139fa864b /drivers/ide
parent97cca37c9b3ffdb7629d9ad4c136e41c50ed19f3 (diff)
downloadlinux-aeca4e33904532a6959aadc87a1de59d1e67664c.tar.xz
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>
Diffstat (limited to 'drivers/ide')
-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);
/*