svn commit: r358202 - in stable: 11/sys/kern 11/sys/sys 12/sys/kern 12/sys/sys

[Kyle Evans]

Author: kevans
Date: Fri Feb 21 04:30:21 2020
New Revision: 358202
URL: https://svnweb.freebsd.org/changeset/base/358202

Log:
  MFC r357899: u_char -> vm_prot_t in a couple of places, NFC
  
  The latter is a typedef of the former; the typedef exists and these bits are
  representing vmprot values, so use the correct type.

Modified:
  stable/11/sys/kern/kern_descrip.c
  stable/11/sys/kern/sys_capability.c
  stable/11/sys/sys/capsicum.h
  stable/11/sys/sys/file.h
Directory Properties:
  stable/11/   (props changed)

Changes in other areas also in this revision:
Modified:
  stable/12/sys/kern/kern_descrip.c
  stable/12/sys/kern/sys_capability.c
  stable/12/sys/sys/capsicum.h
  stable/12/sys/sys/file.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/11/sys/kern/kern_descrip.c
==============================================================================
--- stable/11/sys/kern/kern_descrip.c	Fri Feb 21 04:29:50 2020	(r358201)
+++ stable/11/sys/kern/kern_descrip.c	Fri Feb 21 04:30:21 2020	(r358202)
@@ -2684,7 +2684,7 @@ fget(struct thread *td, int fd, cap_rights_t *rightsp,
 }
 
 int
-fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, u_char *maxprotp,
+fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp, vm_prot_t *maxprotp,
     struct file **fpp)
 {
 	int error;

Modified: stable/11/sys/kern/sys_capability.c
==============================================================================
--- stable/11/sys/kern/sys_capability.c	Fri Feb 21 04:29:50 2020	(r358201)
+++ stable/11/sys/kern/sys_capability.c	Fri Feb 21 04:30:21 2020	(r358202)
@@ -178,10 +178,10 @@ cap_check(const cap_rights_t *havep, const cap_rights_
 /*
  * Convert capability rights into VM access flags.
  */
-u_char
+vm_prot_t
 cap_rights_to_vmprot(cap_rights_t *havep)
 {
-	u_char maxprot;
+	vm_prot_t maxprot;
 
 	maxprot = VM_PROT_NONE;
 	if (cap_rights_is_set(havep, CAP_MMAP_R))

Modified: stable/11/sys/sys/capsicum.h
==============================================================================
--- stable/11/sys/sys/capsicum.h	Fri Feb 21 04:29:50 2020	(r358201)
+++ stable/11/sys/sys/capsicum.h	Fri Feb 21 04:30:21 2020	(r358202)
@@ -355,7 +355,7 @@ int	cap_check(const cap_rights_t *havep, const cap_rig
 /*
  * Convert capability rights into VM access flags.
  */
-u_char	cap_rights_to_vmprot(cap_rights_t *havep);
+vm_prot_t	cap_rights_to_vmprot(cap_rights_t *havep);
 
 /*
  * For the purposes of procstat(1) and similar tools, allow kern_descrip.c to

Modified: stable/11/sys/sys/file.h
==============================================================================
--- stable/11/sys/sys/file.h	Fri Feb 21 04:29:50 2020	(r358201)
+++ stable/11/sys/sys/file.h	Fri Feb 21 04:30:21 2020	(r358202)
@@ -232,7 +232,7 @@ extern volatile int openfiles;	/* actual number of ope
 
 int fget(struct thread *td, int fd, cap_rights_t *rightsp, struct file **fpp);
 int fget_mmap(struct thread *td, int fd, cap_rights_t *rightsp,
-    u_char *maxprotp, struct file **fpp);
+    vm_prot_t *maxprotp, struct file **fpp);
 int fget_read(struct thread *td, int fd, cap_rights_t *rightsp,
     struct file **fpp);
 int fget_write(struct thread *td, int fd, cap_rights_t *rightsp,