Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 438ee6798cd8bfc44da725fca846367e19d86652

Authored by Jeff Dike
Committed by Linus Torvalds
1 parent 83380cc1c9
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

uml: DEBUG_SHIRQ fixes 

A couple more DEBUG_SHIRQ fixes.

The previous mconsole blocking fix exposed the lack of O_NONBLOCK on the
mconsole socket.

Also, winch_interrupt started crashing because it is called at irq free time
and it tries to dereference tty->driver_data, which has already been set to
NULL.

I added some error cleanup in mconsole_init while I was there.

Cc: "Karol Swietlicki" <magotari@gmail.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 12 additions and 4 deletions Side-by-side Diff

arch/um/drivers/line.c
Diff comments   View file @ 438ee67
... ... @@ -774,9 +774,11 @@
774 774 tty = winch->tty;
775 775 if (tty != NULL) {
776 776 line = tty->driver_data;
777   - chan_window_size(&line->chan_list, &tty->winsize.ws_row,
778   - &tty->winsize.ws_col);
779   - kill_pgrp(tty->pgrp, SIGWINCH, 1);
  777 + if (line != NULL) {
  778 + chan_window_size(&line->chan_list, &tty->winsize.ws_row,
  779 + &tty->winsize.ws_col);
  780 + kill_pgrp(tty->pgrp, SIGWINCH, 1);
  781 + }
780 782 }
781 783 out:
782 784 if (winch->fd != -1)
arch/um/drivers/mconsole_kern.c
Diff comments   View file @ 438ee67
... ... @@ -792,6 +792,8 @@
792 792 printk(KERN_ERR "Failed to initialize management console\n");
793 793 return 1;
794 794 }
  795 + if (os_set_fd_block(sock, 0))
  796 + goto out;
795 797  
796 798 register_reboot_notifier(&reboot_notifier);
797 799  
... ... @@ -800,7 +802,7 @@
800 802 "mconsole", (void *)sock);
801 803 if (err) {
802 804 printk(KERN_ERR "Failed to get IRQ for management console\n");
803   - return 1;
  805 + goto out;
804 806 }
805 807  
806 808 if (notify_socket != NULL) {
... ... @@ -816,6 +818,10 @@
816 818 printk(KERN_INFO "mconsole (version %d) initialized on %s\n",
817 819 MCONSOLE_VERSION, mconsole_socket_name);
818 820 return 0;
  821 +
  822 + out:
  823 + os_close_file(sock);
  824 + return 1;
819 825 }
820 826  
821 827 __initcall(mconsole_init);