aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
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 /include/linux
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 'include/linux')
-rw-r--r--include/linux/ide.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/ide.h b/include/linux/ide.h
index a9a9e33e448f..07d8d725541f 100644
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
@@ -825,6 +825,9 @@ typedef struct hwgroup_s {
825 unsigned int sleeping : 1; 825 unsigned int sleeping : 1;
826 /* BOOL: polling active & poll_timeout field valid */ 826 /* BOOL: polling active & poll_timeout field valid */
827 unsigned int polling : 1; 827 unsigned int polling : 1;
828 /* BOOL: in a polling reset situation. Must not trigger another reset yet */
829 unsigned int resetting : 1;
830
828 /* current drive */ 831 /* current drive */
829 ide_drive_t *drive; 832 ide_drive_t *drive;
830 /* ptr to current hwif in linked-list */ 833 /* ptr to current hwif in linked-list */