diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2013-02-12 16:46:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-02-12 17:34:00 -0500 |
commit | 6e6668845fe593414a938b7726d6359b5570ac5a (patch) | |
tree | 9cd88fc22e8f5eb8250fbd27466b526f57f8a3d4 /kernel | |
parent | 4ba902b5741859a04fdb90d675b9a87721a3fd59 (diff) |
kernel/pid.c: reenable interrupts when alloc_pid() fails because init has exited
We're forgetting to reenable local interrupts on an error path.
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Reported-by: Josh Boyer <jwboyer@redhat.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/pid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/pid.c b/kernel/pid.c index de9af600006f..f2c6a6825098 100644 --- a/kernel/pid.c +++ b/kernel/pid.c | |||
@@ -331,7 +331,7 @@ out: | |||
331 | return pid; | 331 | return pid; |
332 | 332 | ||
333 | out_unlock: | 333 | out_unlock: |
334 | spin_unlock(&pidmap_lock); | 334 | spin_unlock_irq(&pidmap_lock); |
335 | out_free: | 335 | out_free: |
336 | while (++i <= ns->level) | 336 | while (++i <= ns->level) |
337 | free_pidmap(pid->numbers + i); | 337 | free_pidmap(pid->numbers + i); |