diff options
author | Luke Shumaker <lukeshu@parabola.nu> | 2017-12-22 15:27:57 +0100 |
---|---|---|
committer | Florian Weimer <fweimer@redhat.com> | 2017-12-22 15:27:57 +0100 |
commit | f43ead291c501dcfd9381e99cacb118b33344b04 (patch) | |
tree | 9b9d0fbef6c5971657d02861e81d052b6e9a0c45 /streams/fattach.c | |
parent | bd81a9d1e99f04d0b664542ddec2d270789f7ec1 (diff) | |
download | glibc-f43ead291c501dcfd9381e99cacb118b33344b04.tar.gz glibc-f43ead291c501dcfd9381e99cacb118b33344b04.tar.xz glibc-f43ead291c501dcfd9381e99cacb118b33344b04.zip |
linux ttyname{_r}: Make tty checks consistent
In the ttyname and ttyname_r routines on Linux, at several points it needs to check if a given TTY is the TTY we are looking for. It used to be that this check was (to see if `maybe` is `mytty`): __xstat64(_STAT_VER, maybe_filename, &maybe) == 0 #ifdef _STATBUF_ST_RDEV && S_ISCHR(maybe.st_mode) && maybe.st_rdev == mytty.st_rdev #else && maybe.st_ino == mytty.st_ino && maybe.st_dev == mytty.st_dev #endif This check appears in several places. Then, one of the changes made in commit 15e9a4f378c8607c2ae1aa465436af4321db0e23 was to change that check to: __xstat64(_STAT_VER, maybe_filename, &maybe) == 0 #ifdef _STATBUF_ST_RDEV && S_ISCHR(maybe.st_mode) && maybe.st_rdev == mytty.st_rdev #endif && maybe.st_ino == mytty.st_ino && maybe.st_dev == mytty.st_dev That is, it made the st_ino and st_dev parts of the check happen even if we have the st_rdev member. This is an important change, because the kernel allows multiple devpts filesystem instances to be created; a device file in one devpts instance may share the same st_rdev with a file in another devpts instance, but they aren't the same file. This check appears twice in each file (ttyname.c and ttyname_r.c), once (in ttyname and __ttyname_r) to check if a candidate file found by inspecting /proc is the desired TTY, and once (in getttyname and getttyname_r) to check if a candidate file found by searching /dev is the desired TTY. However, 15e9a4f only updated the checks for files found via /proc; but the concern about collisions between devpts instances is just as valid for files found via /dev. So, update all 4 occurrences the check to be consistent with the version of the check introduced in 15e9a4f. Make it easy to keep all 4 occurrences of the check consistent by pulling it in to a static inline function, is_mytty. Reviewed-by: Christian Brauner <christian.brauner@ubuntu.com> (cherry picked from commit 2fbce9c2031e70b6bd67876accfc34b0ec492878)
Diffstat (limited to 'streams/fattach.c')
0 files changed, 0 insertions, 0 deletions