hulk inclusion category: bugfix bugzilla: https://gitee.com/src-openeuler/kernel/issues/IACT4T CVE: CVE-2024-40966
--------------------------------
Fix kabi breakage in struct tty_operations.
Fixes: 1f84e36332c7 ("tty: add the option to have a tty reject a new ldisc") Signed-off-by: Yi Yang yiyang13@huawei.com --- include/linux/tty_driver.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/include/linux/tty_driver.h b/include/linux/tty_driver.h index 9ab7516472e7..aaaab5095d7c 100644 --- a/include/linux/tty_driver.h +++ b/include/linux/tty_driver.h @@ -381,7 +381,6 @@ struct tty_operations { void (*hangup)(struct tty_struct *tty); int (*break_ctl)(struct tty_struct *tty, int state); void (*flush_buffer)(struct tty_struct *tty); - int (*ldisc_ok)(struct tty_struct *tty, int ldisc); void (*set_ldisc)(struct tty_struct *tty); void (*wait_until_sent)(struct tty_struct *tty, int timeout); void (*send_xchar)(struct tty_struct *tty, char ch); @@ -400,7 +399,7 @@ struct tty_operations { void (*poll_put_char)(struct tty_driver *driver, int line, char ch); #endif int (*proc_show)(struct seq_file *m, void *driver); - KABI_RESERVE(0) + KABI_USE(0, int (*ldisc_ok)(struct tty_struct *tty, int ldisc)) KABI_RESERVE(1) } __randomize_layout;