aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorAlan Cox <alan@lxorguk.ukuu.org.uk>2006-10-03 04:14:33 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-10-03 11:04:08 -0400
commit913759ac90a727b86da72efcfb70931f497d1cb7 (patch)
treef95e10f757e93eca8eacbf03985c09994ec4ef46 /drivers/ide
parentb86cc29dc42203588264d917e88134bdd500b0d7 (diff)
[PATCH] ide: Fix crash on repeated reset
Michal Miroslaw reported a problem (bugzilla #7023) where a user initiated reset while the IDE layer was already resetting the channel caused a crash, and provided a rough fix. This is a slightly cleaner version of the fix which tracks the reset state and blocks further reset requests while a reset is in progress. Note this is not a security issue - random end users can't access the ioctl in question anyway. Signed-off-by: Alan Cox <alan@redhat.com> Cc: Michal Miroslaw <mirq-linux@rere.qmqm.pl> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/ide-iops.c4
-rw-r--r--drivers/ide/ide.c5
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index 77703acaec17..badde6331775 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -998,6 +998,7 @@ static ide_startstop_t atapi_reset_pollfunc (ide_drive_t *drive)
998 } 998 }
999 /* done polling */ 999 /* done polling */
1000 hwgroup->polling = 0; 1000 hwgroup->polling = 0;
1001 hwgroup->resetting = 0;
1001 return ide_stopped; 1002 return ide_stopped;
1002} 1003}
1003 1004
@@ -1057,6 +1058,7 @@ static ide_startstop_t reset_pollfunc (ide_drive_t *drive)
1057 } 1058 }
1058 } 1059 }
1059 hwgroup->polling = 0; /* done polling */ 1060 hwgroup->polling = 0; /* done polling */
1061 hwgroup->resetting = 0; /* done reset attempt */
1060 return ide_stopped; 1062 return ide_stopped;
1061} 1063}
1062 1064
@@ -1143,6 +1145,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
1143 1145
1144 /* For an ATAPI device, first try an ATAPI SRST. */ 1146 /* For an ATAPI device, first try an ATAPI SRST. */
1145 if (drive->media != ide_disk && !do_not_try_atapi) { 1147 if (drive->media != ide_disk && !do_not_try_atapi) {
1148 hwgroup->resetting = 1;
1146 pre_reset(drive); 1149 pre_reset(drive);
1147 SELECT_DRIVE(drive); 1150 SELECT_DRIVE(drive);
1148 udelay (20); 1151 udelay (20);
@@ -1168,6 +1171,7 @@ static ide_startstop_t do_reset1 (ide_drive_t *drive, int do_not_try_atapi)
1168 return ide_stopped; 1171 return ide_stopped;
1169 } 1172 }
1170 1173
1174 hwgroup->resetting = 1;
1171 /* 1175 /*
1172 * Note that we also set nIEN while resetting the device, 1176 * Note that we also set nIEN while resetting the device,
1173 * to mask unwanted interrupts from the interface during the reset. 1177 * to mask unwanted interrupts from the interface during the reset.
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c
index 97b162ca9885..287a66201150 100644
--- a/drivers/ide/ide.c
+++ b/drivers/ide/ide.c
@@ -1364,6 +1364,11 @@ int generic_ide_ioctl(ide_drive_t *drive, struct file *file, struct block_device
1364 1364
1365 spin_lock_irqsave(&ide_lock, flags); 1365 spin_lock_irqsave(&ide_lock, flags);
1366 1366
1367 if (HWGROUP(drive)->resetting) {
1368 spin_unlock_irqrestore(&ide_lock, flags);
1369 return -EBUSY;
1370 }
1371
1367 ide_abort(drive, "drive reset"); 1372 ide_abort(drive, "drive reset");
1368 1373
1369 BUG_ON(HWGROUP(drive)->handler); 1374 BUG_ON(HWGROUP(drive)->handler);