Date: Fri, 01 May 2026 19:21:14 +0000 From: Dag-Erling=?utf-8?Q? Sm=C3=B8rg?=rav <des@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Ricardo Branco <rbranco@suse.de> Subject: git: 78a9bd068e1b - stable/14 - linprocfs: Continue on error when reading process limits Message-ID: <69f4fd2a.3d09c.2d213807@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=78a9bd068e1b21554d08b9d2687b357219a151da commit 78a9bd068e1b21554d08b9d2687b357219a151da Author: Ricardo Branco <rbranco@suse.de> AuthorDate: 2025-02-06 21:46:19 +0000 Commit: Dag-Erling Smørgrav <des@FreeBSD.org> CommitDate: 2026-05-01 15:39:17 +0000 linprocfs: Continue on error when reading process limits The process limits may be unavailable due to capsicum. Like other areas of the system, report what we can w/o error. This is what Linux does. PR: 283726 Reviewed by: imp, dchagin Pull Request: https://github.com/freebsd/freebsd-src/pull/1592 (cherry picked from commit ea60d917e5b1943c8638af056dbcdbb3646207f1) --- sys/compat/linprocfs/linprocfs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index d4f38b491471..023134a9ba14 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1913,7 +1913,7 @@ linprocfs_doproclimits(PFS_FILL_ARGS) "kern.sigqueue.max_pending_per_proc", &res, &size, 0, 0, 0, 0); if (error != 0) - goto out; + continue; rl.rlim_cur = res; rl.rlim_max = res; break; @@ -1921,7 +1921,7 @@ linprocfs_doproclimits(PFS_FILL_ARGS) error = kernel_sysctlbyname(td, "kern.ipc.msgmnb", &res, &size, 0, 0, 0, 0); if (error != 0) - goto out; + continue; rl.rlim_cur = res; rl.rlim_max = res; break; @@ -1943,9 +1943,9 @@ linprocfs_doproclimits(PFS_FILL_ARGS) li->desc, (unsigned long long)rl.rlim_cur, (unsigned long long)rl.rlim_max, li->unit); } -out: + lim_free(limp); - return (error); + return (0); } /*home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?69f4fd2a.3d09c.2d213807>