The branch stable/13 has been updated by jamie: URL: https://cgit.FreeBSD.org/src/commit/?id=13cb61f9723e4b4d1cd7d14850837a4cfe5bc15f
commit 13cb61f9723e4b4d1cd7d14850837a4cfe5bc15f Author: Jamie Gritton <[email protected]> AuthorDate: 2021-09-29 17:20:36 +0000 Commit: Jamie Gritton <[email protected]> CommitDate: 2021-10-07 16:29:30 +0000 MFC uipc_shm: Fix kern.ipc.posix_shm_list for jails Fix error return of kern.ipc.posix_shm_list, which caused it (and thus "posixshmcontrol ls") to fail for all jails that didn't happen to own the last shm object in the list. (cherry picked from commit 747a47261eee59b6e9c437cd2c1b3979df5c32ac) --- sys/kern/uipc_shm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index 58c9f8cec239..622886e15e58 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1926,8 +1926,10 @@ sysctl_posix_shm_list(SYSCTL_HANDLER_ARGS) LIST_FOREACH(shmm, &shm_dictionary[i], sm_link) { error = shm_fill_kinfo_locked(shmm->sm_shmfd, &kif, true); - if (error == EPERM) + if (error == EPERM) { + error = 0; continue; + } if (error != 0) break; pack_kinfo(&kif);
