diff options
| author | Allan Jude <allanjude@FreeBSD.org> | 2021-11-04 12:55:33 +0000 |
|---|---|---|
| committer | Mark Johnston <markj@FreeBSD.org> | 2022-03-24 17:24:07 +0000 |
| commit | 26714a5fa2c650f530b4977f1a005bad5f875567 (patch) | |
| tree | 734890d1ae7ab403c8c89ae990c88bee06ae8d7d | |
| parent | 9f83c6fa52fb7c5a256fed2f1a13735b66b8f7c2 (diff) | |
| download | src-26714a5fa2c650f530b4977f1a005bad5f875567.tar.gz src-26714a5fa2c650f530b4977f1a005bad5f875567.zip | |
Allow kern.ipc.maxsockets to be set to current value without error
Normally setting kern.ipc.maxsockets returns EINVAL if the new value
is not greater than the previous value. This can cause spurious
error messages when sysctl.conf is processed multiple times, or when
automation systems try to ensure the sysctl is set to the correct
value. If the value is unchanged, then just do nothing.
Approved by: re (gjb)
PR: 243532
Reviewed by: markj
Sponsored by: Modirum MDPay
Sponsored by: Klara Inc.
(cherry picked from commit c441592a0e1591591665cd037a8a5e9b54675f99)
(cherry picked from commit 4f69c575996e069bfee62af9db2faa3ffa65db71)
| -rw-r--r-- | sys/kern/uipc_socket.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index 5a3748eb8cf5..bdd7756916d9 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -363,7 +363,7 @@ sysctl_maxsockets(SYSCTL_HANDLER_ARGS) newmaxsockets = maxsockets; error = sysctl_handle_int(oidp, &newmaxsockets, 0, req); - if (error == 0 && req->newptr) { + if (error == 0 && req->newptr && newmaxsockets != maxsockets) { if (newmaxsockets > maxsockets && newmaxsockets <= maxfiles) { maxsockets = newmaxsockets; |