diff options
| author |   Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com> | 2007-08-01 21:18:44 +0900 |
|---|---|---|
| committer |   Tony Luck <tony.luck@intel.com> | 2007-08-01 11:57:59 -0700 |
| commit | 224685c0d1ca5970364c9f5d4f21ea1aa64c381e (patch) | |
| tree | ef5153fedcfe7172d86a8d1d4ca5ed835ab79253 /arch/ia64 | |
| parent | [IA64] Fix possible race in destroy_and_reserve_irq() (diff) | |
| download | linux-dev-224685c0d1ca5970364c9f5d4f21ea1aa64c381e.tar.xz linux-dev-224685c0d1ca5970364c9f5d4f21ea1aa64c381e.zip | |
[IA64] Fix wrong access to irq_desc[] in iosapic_register_intr().
In error path we must unlock irq_desc[irq].lock before we change
'irq'.
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
| -rw-r--r-- | arch/ia64/kernel/iosapic.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c index 5f6d98e866ea..cfe4654838f4 100644 --- a/arch/ia64/kernel/iosapic.c +++ b/arch/ia64/kernel/iosapic.c @@ -794,8 +794,9 @@ iosapic_register_intr (unsigned int gsi, err = register_intr(gsi, irq, IOSAPIC_LOWEST_PRIORITY, polarity, trigger); if (err < 0) { + spin_unlock(&irq_desc[irq].lock); irq = err; - goto unlock_all; + goto unlock_iosapic_lock; } /* @@ -811,7 +812,7 @@ iosapic_register_intr (unsigned int gsi, gsi, (trigger == IOSAPIC_EDGE ? "edge" : "level"), (polarity == IOSAPIC_POL_HIGH ? "high" : "low"), cpu_logical_id(dest), dest, irq_to_vector(irq)); - unlock_all: + spin_unlock(&irq_desc[irq].lock); unlock_iosapic_lock: spin_unlock_irqrestore(&iosapic_lock, flags); |