lkml.org 
[lkml]   [2011]   [Aug]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/9] um: winch_interrupt() can happen inside of free_winch()
    Date
    From: Al Viro <viro@ftp.linux.org.uk>

    ... 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>
    ---
    arch/um/drivers/line.c | 6 ++++--
    1 files changed, 4 insertions(+), 2 deletions(-)

    diff --git a/arch/um/drivers/line.c b/arch/um/drivers/line.c
    index c5bff1d..91bf1894 100644
    --- a/arch/um/drivers/line.c
    +++ b/arch/um/drivers/line.c
    @@ -725,6 +725,8 @@ struct winch {

    static void free_winch(struct winch *winch, int free_irq_ok)
    {
    + int fd = winch->fd;
    + winch->fd = -1;
    if (free_irq_ok)
    free_irq(WINCH_IRQ, winch);

    @@ -732,8 +734,8 @@ static void free_winch(struct winch *winch, int free_irq_ok)

    if (winch->pid != -1)
    os_kill_process(winch->pid, 1);
    - if (winch->fd != -1)
    - os_close_file(winch->fd);
    + if (fd != -1)
    + os_close_file(fd);
    if (winch->stack != 0)
    free_stack(winch->stack, 0);
    kfree(winch);
    --
    1.7.6.1


    \
     
     \ /
      Last update: 2011-08-29 18:17    [W:0.043 / U:2.804 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site