summaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2020-01-07 16:06:07 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-02-24 08:34:49 +0100
commitb7f0e2b3971c5af2c80a14117d28815b85139d3b (patch)
tree92821b5159f3901c146e2c3742d8fdf4e8ba9d62 /drivers/ide
parentaeca4e33904532a6959aadc87a1de59d1e67664c (diff)
downloadlinux-stable-b7f0e2b3971c5af2c80a14117d28815b85139d3b.tar.gz
linux-stable-b7f0e2b3971c5af2c80a14117d28815b85139d3b.tar.bz2
linux-stable-b7f0e2b3971c5af2c80a14117d28815b85139d3b.zip
ide: serverworks: potential overflow in svwks_set_pio_mode()
[ Upstream commit ce1f31b4c0b9551dd51874dd5364654ed4ca13ae ] The "drive->dn" variable is a u8 controlled by root. 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/serverworks.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/ide/serverworks.c b/drivers/ide/serverworks.c
index a97affca18ab..0f57d45484d1 100644
--- a/drivers/ide/serverworks.c
+++ b/drivers/ide/serverworks.c
@@ -114,6 +114,9 @@ static void svwks_set_pio_mode(ide_hwif_t *hwif, ide_drive_t *drive)
struct pci_dev *dev = to_pci_dev(hwif->dev);
const u8 pio = drive->pio_mode - XFER_PIO_0;
+ if (drive->dn >= ARRAY_SIZE(drive_pci))
+ return;
+
pci_write_config_byte(dev, drive_pci[drive->dn], pio_modes[pio]);
if (svwks_csb_check(dev)) {
@@ -140,6 +143,9 @@ static void svwks_set_dma_mode(ide_hwif_t *hwif, ide_drive_t *drive)
u8 ultra_enable = 0, ultra_timing = 0, dma_timing = 0;
+ if (drive->dn >= ARRAY_SIZE(drive_pci2))
+ return;
+
pci_read_config_byte(dev, (0x56|hwif->channel), &ultra_timing);
pci_read_config_byte(dev, 0x54, &ultra_enable);