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

filedesc: avoid spurious copying of capabilities in fget_unlocked

Browse Source 
We obtain a stable copy and store it in local 'fde' variable. Storing another
copy (based on aforementioned variable) does not serve any purpose.

No functional changes.
This commit is contained in:
mjg 2015-01-21 18:32:53 +00:00
parent e15a87cc6a
commit 9bc86796d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/kern/kern_descrip.c
View File

@ -2337,7 +2337,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
u_int count;
#ifdef CAPABILITIES
seq_t seq;
cap_rights_t haverights;
cap_rights_t *haverights;
int error;
#endif
@ -2367,9 +2367,9 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
if (fp == NULL)
return (EBADF);
#ifdef CAPABILITIES
haverights = *cap_rights_fde(&fde);
haverights = cap_rights_fde(&fde);
if (needrightsp != NULL) {
error = cap_check(&haverights, needrightsp);
error = cap_check(haverights, needrightsp);
if (error != 0)
return (error);
if (cap_rights_is_set(needrightsp, CAP_FCNTL)) {
@ -2408,7 +2408,7 @@ fget_unlocked(struct filedesc *fdp, int fd, cap_rights_t *needrightsp,
*fpp = fp;
if (haverightsp != NULL) {
#ifdef CAPABILITIES
*haverightsp = haverights;
*haverightsp = *haverights;
#else
CAP_ALL(haverightsp);
#endif