Unverified Commit 6eb0bad1 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!10912 Fix CVE-2024-40966 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/OH2OBAAF4M5BN6LHTXFFPHU3EH3QOJHW/ 
Fix CVE-2024-40966 for OLK-5.10

Linus Torvalds (1):
  tty: add the option to have a tty reject a new ldisc

Yi Yang (1):
  tty: vt device use only n_tty ldisc


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IACT4T 
 
Link:https://gitee.com/openeuler/kernel/pulls/10912

 

Reviewed-by: default avatarYang Yingliang <yangyingliang@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents f8329b94 5acccdd8

drivers/tty/tty_ldisc.c

+10 −0
Original line number Diff line number Diff line
@@ -579,6 +579,16 @@ int tty_set_ldisc(struct tty_struct *tty, int disc) 
		goto out;

	}



#ifdef CONFIG_VT

	/*vt device use only n_tty ldisc*/

	if (tty->ops->ioctl == vt_ioctl) {

		if (disc != N_TTY) {

			retval = -EINVAL;

			goto out;

		}

	}

#endif



	old_ldisc = tty->ldisc;



	/* Shutdown the old discipline. */