lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

um: winch_interrupt() can happen inside of free_winch()

Browse Source 
...  so set winch->fd to -1 before doing free_irq(), to avoid having
winch_interrupt() come from/during the latter and attempt to do
reactivate_fd() on something that's already gone.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Al Viro
2011-09-14 16:21:28 -07:00
committed by Linus Torvalds
parent f71f94845e
commit 45cd5e2d4e
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/um/drivers/line.c
View File

@@ -725,6 +725,8 @@ struct winch {
static void free_winch(struct winch *winch, int free_irq_ok) static void free_winch(struct winch *winch, int free_irq_ok)
{ {
int fd = winch->fd;
winch->fd = -1;
if (free_irq_ok) if (free_irq_ok)
free_irq(WINCH_IRQ, winch); free_irq(WINCH_IRQ, winch);
@@ -732,8 +734,8 @@ static void free_winch(struct winch *winch, int free_irq_ok)
if (winch->pid != -1) if (winch->pid != -1)
os_kill_process(winch->pid, 1); os_kill_process(winch->pid, 1);
if (winch->fd != -1) if (fd != -1)
os_close_file(winch->fd); os_close_file(fd);
if (winch->stack != 0) if (winch->stack != 0)
free_stack(winch->stack, 0); free_stack(winch->stack, 0);
kfree(winch); kfree(winch);