diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-06 11:43:50 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-12-06 11:43:50 -0800 |
| commit | d49248eb25a223b238cd7687ea92b080f595a323 (patch) | |
| tree | 42f85ed6f552134507054838f70f3820c6050646 /include | |
| parent | f5226f1d20c4113922dbe7742c416f06700c1ea9 (diff) | |
| parent | c8bcd9c5be24fb9e6132e97da5a35e55a83e36b9 (diff) | |
| download | linux-d49248eb25a223b238cd7687ea92b080f595a323.tar.bz2 | |
Merge tag 'tty-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty fixes from Greg KH:
"Here are two tty core fixes for 5.10-rc7.
They resolve some reported locking issues in the tty core. While they
have not been in a released linux-next yet, they have passed all of
the 0-day bot testing as well as the submitter's testing"
* tag 'tty-5.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
tty: Fix ->session locking
tty: Fix ->pgrp locking in tiocspgrp()
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/tty.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/tty.h b/include/linux/tty.h index a99e9b8e4e31..eb33d948788c 100644 --- a/include/linux/tty.h +++ b/include/linux/tty.h @@ -306,6 +306,10 @@ struct tty_struct { struct termiox *termiox; /* May be NULL for unsupported */ char name[64]; struct pid *pgrp; /* Protected by ctrl lock */ + /* + * Writes protected by both ctrl lock and legacy mutex, readers must use + * at least one of them. + */ struct pid *session; unsigned long flags; int count; |