d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tty: switch ttyhook_register to use fget_cap_locked

Browse Source 
It is still wrong-ish as fget* funcs don't expect to operate on abitrary
file descriptor tables, but this at least moves it out of the way of an
upcoming change while being bug-compatible.
This commit is contained in:
Mateusz Guzik 2022-02-11 12:00:25 +00:00
parent 93288e2445
commit f40dd6c803
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/kern/tty.c
View File

@ -2074,9 +2074,16 @@ ttyhook_register(struct tty **rtp, struct proc *p, int fd, struct ttyhook *th,
int error, ref;
/* Validate the file descriptor. */
/*
* XXX this code inspects a file descriptor from a different process,
* but there is no dedicated routine to do it in fd code, making the
* ordeal highly questionable.
*/
fdp = p->p_fd;
error = fget_unlocked(fdp, fd, cap_rights_init_one(&rights, CAP_TTYHOOK),
&fp);
FILEDESC_SLOCK(fdp);
error = fget_cap_locked(fdp, fd, cap_rights_init_one(&rights, CAP_TTYHOOK),
&fp, NULL);
FILEDESC_SUNLOCK(fdp);
if (error != 0)
return (error);
if (fp->f_ops == &badfileops) {