D20800.diff
No OneTemporary
Actions

Size

891 B

Referenced Files

None

Subscribers

None

D20800.diff
View Options

	Index: head/sys/kern/kern_descrip.c
	===================================================================
	--- head/sys/kern/kern_descrip.c
	+++ head/sys/kern/kern_descrip.c
	@@ -2761,6 +2761,7 @@
	if (maxprotp != NULL)
	*maxprotp = VM_PROT_ALL;
	#else
	+ cap_rights_t fdrights;
	struct filedesc *fdp = td->td_proc->p_fd;
	seqc_t seq;

	@@ -2769,15 +2770,18 @@
	error = _fget(td, fd, fpp, 0, rightsp, &seq);
	if (error != 0)
	return (error);
	- /*
	- * If requested, convert capability rights to access flags.
	- */
	if (maxprotp != NULL)
	- *maxprotp = cap_rights_to_vmprot(cap_rights(fdp, fd));
	+ fdrights = *cap_rights(fdp, fd);
	if (!fd_modified(fdp, fd, seq))
	break;
	fdrop(*fpp, td);
	}
	+
	+ /*
	+ * If requested, convert capability rights to access flags.
	+ */
	+ if (maxprotp != NULL)
	+ *maxprotp = cap_rights_to_vmprot(&fdrights);
	#endif
	return (error);
	}