diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-08-24 09:27:21 +0200 |
| commit | a057efde80453c68c60e156803578a654b52c39f (patch) | |
| tree | 51c312e95de536b6a29d18a12cfdba72029e09ad /drivers/tty/tty_io.c | |
| parent | 17a1eab7b70d85fc5711f37bb6e530b771736bb7 (diff) | |
| parent | a4a6eed851bb661477654d772807d0e5aee5629c (diff) | |
Merge branch 'for-linus' into for-next
Back-merge the 6.5-devel branch for the clean patch application for
6.6 and resolving merge conflicts.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'drivers/tty/tty_io.c')
| -rw-r--r-- | drivers/tty/tty_io.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c index 3959efc717aa..63db04b9113a 100644 --- a/drivers/tty/tty_io.c +++ b/drivers/tty/tty_io.c @@ -2285,7 +2285,7 @@ static int tiocsti(struct tty_struct *tty, char __user *p) char ch, mbz = 0; struct tty_ldisc *ld; - if (!tty_legacy_tiocsti) + if (!tty_legacy_tiocsti && !capable(CAP_SYS_ADMIN)) return -EIO; if ((current->signal->tty != tty) && !capable(CAP_SYS_ADMIN)) |