Merge "tty: Fix possible NULL pointer dereference" (7b713e80) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/tty/n_tty.c

+11 −1

Original line number	Diff line number	Diff line
		@@ -847,7 +847,12 @@ static void continue_process_echoes(struct work_struct *work)
		{
		struct tty_struct *tty =
		container_of(work, struct tty_struct, echo_delayed_work.work);
		struct n_tty_data *ldata = tty->disc_data;
		struct n_tty_data *ldata;

		/* Possible for n_tty_close() is called here and free the disc_data */
		ldata = tty->disc_data;
		if (!ldata)
		return;

		mutex_lock(&ldata->output_lock);
		tty->delayed_work = 0;
		@@ -1918,6 +1923,11 @@ static void n_tty_close(struct tty_struct *tty)
		if (tty->link)
		n_tty_packet_mode_flush(tty);

		#if defined(CONFIG_TTY_FLUSH_LOCAL_ECHO)
		if (tty->echo_delayed_work.work.func)
		cancel_delayed_work_sync(&tty->echo_delayed_work);
		#endif

		vfree(ldata);
		tty->disc_data = NULL;
		}