diff options
| author | Alan Cox <alan@lxorguk.ukuu.org.uk> | 2006-10-03 01:14:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-03 08:04:08 -0700 |
| commit | 913759ac90a727b86da72efcfb70931f497d1cb7 (patch) | |
| tree | f95e10f757e93eca8eacbf03985c09994ec4ef46 /drivers/ide/ide.c | |
| parent | b86cc29dc42203588264d917e88134bdd500b0d7 (diff) | |
| download | op-kernel-dev-913759ac90a727b86da72efcfb70931f497d1cb7.zip op-kernel-dev-913759ac90a727b86da72efcfb70931f497d1cb7.tar.gz | |
[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/ide.c')
| -rw-r--r-- | drivers/ide/ide.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/ide/ide.c b/drivers/ide/ide.c index 97b162c..287a662 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 spin_lock_irqsave(&ide_lock, flags); + if (HWGROUP(drive)->resetting) { + spin_unlock_irqrestore(&ide_lock, flags); + return -EBUSY; + } + ide_abort(drive, "drive reset"); BUG_ON(HWGROUP(drive)->handler); |
