Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 45cd5e2d4e632f55af1d6131f33b554c98f8b929

Authored by Al Viro
Committed by Linus Torvalds
1 parent f71f94845e
Exists in master and in 38 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

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

...  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>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

arch/um/drivers/line.c
Diff comments   View file @ 45cd5e2
... ... @@ -725,6 +725,8 @@
725 725  
726 726 static void free_winch(struct winch *winch, int free_irq_ok)
727 727 {
  728 + int fd = winch->fd;
  729 + winch->fd = -1;
728 730 if (free_irq_ok)
729 731 free_irq(WINCH_IRQ, winch);
730 732  
... ... @@ -732,8 +734,8 @@
732 734  
733 735 if (winch->pid != -1)
734 736 os_kill_process(winch->pid, 1);
735   - if (winch->fd != -1)
736   - os_close_file(winch->fd);
  737 + if (fd != -1)
  738 + os_close_file(fd);
737 739 if (winch->stack != 0)
738 740 free_stack(winch->stack, 0);
739 741 kfree(winch);