Skip to content

Commit

Permalink
Use uintptr_t to convert a pointer to an integer
Browse files Browse the repository at this point in the history
Issue seen on CheriBSD running on a Morello board
(capability-to-integer-cast error).

The relevant capability metadata for pointers is preserved in the
uintptr_t datatype.  This way, afterwards in the code, the other way
round of converting the computed integer value to a pointer works fine.
  • Loading branch information
Julien-Elie committed Nov 2, 2023
1 parent 5f3b357 commit 0c6d73c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -653,6 +653,7 @@ AC_TYPE_OFF_T
AC_TYPE_PID_T
AC_TYPE_SIZE_T
AC_TYPE_SSIZE_T
AC_TYPE_UINTPTR_T
AC_FUNC_GETGROUPS
AC_TYPE_UID_T
AC_CHECK_TYPES([sig_atomic_t], [], [],
Expand Down
4 changes: 2 additions & 2 deletions lib/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ inn__msync_page(void *p, size_t length, int flags)
return -1;
} else {
const size_t mask = ~(size_t) (pagesize - 1);
char *start = (char *) ((size_t) p & mask);
char *end = (char *) (((size_t) p + length + pagesize) & mask);
char *start = (char *) ((uintptr_t) p & mask);
char *end = (char *) (((uintptr_t) p + length + pagesize) & mask);

return msync(start, end - start, flags);
}
Expand Down
4 changes: 2 additions & 2 deletions storage/cnfs/cnfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1004,8 +1004,8 @@ cnfs_mapcntl(void *p, size_t length, int flags)
{
char *start, *end;

start = (char *) ((size_t) p & ~(size_t) (pagesize - 1));
end = (char *) ((size_t) ((char *) p + length + pagesize)
start = (char *) ((uintptr_t) p & ~(size_t) (pagesize - 1));
end = (char *) (((uintptr_t) p + length + pagesize)
& ~(size_t) (pagesize - 1));
if (flags == MS_INVALIDATE) {
msync(start, end - start, flags);
Expand Down

0 comments on commit 0c6d73c

Please sign in to comment.