From nobody Thu May 22 18:24:37 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b3Gsf33X7z5x0Vf; Thu, 22 May 2025 18:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b3Gsf0HK8z3T73; Thu, 22 May 2025 18:24:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747938278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cojidCH6XjgbRxDMjRdPd0ieQ4ttQbmiyCFV3VO3XLA=; b=QXR1fWXFblzLmlj4RDZZOk+NQB+ugpCEdRQ1IVollWXZdCTR06Q9V6t29AoNFqgeeduU+Q d4T3sXLusoA4SqaCOuRDQT+3vbC6r1TNc/nzz8uf0ez/C3QOICeY0cNjy+vfWtA6WTSblO fZTLcVYRe67+KpkdKbETCjbOa2aXK48LTBPudjBjGarPxeOQWNRYn6lDzZ6MKg6eXuynbc kw4Ti4RFY+tom7NXK0CT+1lDU8LKlh3V8ywfih6PrZAH0LqDJdq+oNqAi6hCvTTOu/DW6P p7JVDrNrvqzkrwuUHHbMf3mZuUWv073IYxFEYuCPDB+WzPPKEsodLmNFvzP58Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747938278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cojidCH6XjgbRxDMjRdPd0ieQ4ttQbmiyCFV3VO3XLA=; b=sOBZrlCZ/JYFLElkfj+Kqw2K1iqMO0jmqgdRwJguC/DKRt/8O6COG1H1fegRw7DCwYXk9U rUuV3tekbVWh9Gxqu/2NwdebugIyDwZSPdGIYIteaH264xOI3z4MkvoSfz5qDMrdkRLkHM 5UaujEefXABR/Wa/ZD4E9zSCCrPoVQbtNHXNBeCMFzlbzZKseGLhjMBtf5fAVlnfC2iudX 5EjTo0HeocMbLxXK0ojmvb2qx9HjHMOFtTEq7TYaGX0+Gvur6/73gKyvL+/KK+FEhBlCHv YreiLc/EwT1krwL6jKkmHC1dzsEWZaWw9acO7SRwuIBm9j4TV2BxeJHo7/PFtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747938278; a=rsa-sha256; cv=none; b=JWCI4ZV/WEoJ3S2o1DhsndPbBqUopyx0Z8TXSbKLRKyacOQS0uibrc+Dx92XFJ1asGwmaL pyH1jhCAvoa5ttlLAongQAMXmibrPHqpWCW18y0tlyv9ar1V2worPMnfBstrAZLK9Zp7bt RPRHG2CqRpv2glFdUa1K5eUP0Uk1FG16jyQiLU1G/Hts5uvV/Xn00MMRfBtfAFeQr5d5AB Iallih5oIxxUfPgnPPikMEG301i+d+VfCgO4LYvwfK6QY2BXuGoSi8fT5tzighD7VKZD4H kzj5ft2J/qvax2VSwCPo5Xw5FRQ+tIy6FXqg79a1ci5D3pG6OqBFcjVhWiAyKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b3Gsd6zSYzY4L; Thu, 22 May 2025 18:24:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54MIObrp047226; Thu, 22 May 2025 18:24:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54MIObR0047223; Thu, 22 May 2025 18:24:37 GMT (envelope-from git) Date: Thu, 22 May 2025 18:24:37 GMT Message-Id: <202505221824.54MIObR0047223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Christos Margiolis Subject: git: 2af8f2ad4265 - stable/14 - sndctl(8): Allow read-only sysctls List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: christos X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2af8f2ad42654291ad1fcefba142bcc93976d7f4 Auto-Submitted: auto-generated The branch stable/14 has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=2af8f2ad42654291ad1fcefba142bcc93976d7f4 commit 2af8f2ad42654291ad1fcefba142bcc93976d7f4 Author: Christos Margiolis AuthorDate: 2025-05-21 19:31:23 +0000 Commit: Christos Margiolis CommitDate: 2025-05-22 18:24:28 +0000 sndctl(8): Allow read-only sysctls Needed by follow-up patch. Sponsored by: The FreeBSD Foundation MFC after: 1 day Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D50398 (cherry picked from commit 52c4263274031d599aebfaed2862ae85b482953a) --- usr.sbin/sndctl/sndctl.c | 56 +++++++++++++++++++++++++++++------------------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/usr.sbin/sndctl/sndctl.c b/usr.sbin/sndctl/sndctl.c index 412ea33e5adf..4d3ae0cf526c 100644 --- a/usr.sbin/sndctl/sndctl.c +++ b/usr.sbin/sndctl/sndctl.c @@ -664,30 +664,37 @@ sysctl_int(const char *buf, const char *arg, int *var) size_t size; int n, prev; - n = strtol(arg, NULL, 10); - if (errno == EINVAL || errno == ERANGE) { - warn("strtol(%s)", arg); - return (-1); - } - size = sizeof(int); /* Read current value. */ if (sysctlbyname(buf, &prev, &size, NULL, 0) < 0) { warn("sysctlbyname(%s)", buf); return (-1); } - /* Apply new value. */ - if (sysctlbyname(buf, NULL, 0, &n, size) < 0) { - warn("sysctlbyname(%s, %d)", buf, n); - return (-1); + + /* Read-only. */ + if (arg != NULL) { + errno = 0; + n = strtol(arg, NULL, 10); + if (errno == EINVAL || errno == ERANGE) { + warn("strtol(%s)", arg); + return (-1); + } + + /* Apply new value. */ + if (sysctlbyname(buf, NULL, 0, &n, size) < 0) { + warn("sysctlbyname(%s, %d)", buf, n); + return (-1); + } } + /* Read back applied value for good measure. */ if (sysctlbyname(buf, &n, &size, NULL, 0) < 0) { warn("sysctlbyname(%s)", buf); return (-1); } - printf("%s: %d -> %d\n", buf, prev, n); + if (arg != NULL) + printf("%s: %d -> %d\n", buf, prev, n); if (var != NULL) *var = n; @@ -708,17 +715,21 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) return (-1); } - size = strlen(arg); - /* Apply new value. */ - if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { - warn("sysctlbyname(%s, %s)", buf, arg); - return (-1); - } - /* Get size of new string. */ - if (sysctlbyname(buf, NULL, &size, NULL, 0) < 0) { - warn("sysctlbyname(%s)", buf); - return (-1); + /* Read-only. */ + if (arg != NULL) { + size = strlen(arg); + /* Apply new value. */ + if (sysctlbyname(buf, NULL, 0, arg, size) < 0) { + warn("sysctlbyname(%s, %s)", buf, arg); + return (-1); + } + /* Get size of new string. */ + if (sysctlbyname(buf, NULL, &size, NULL, 0) < 0) { + warn("sysctlbyname(%s)", buf); + return (-1); + } } + if ((tmp = calloc(1, size)) == NULL) err(1, "calloc"); /* Read back applied value for good measure. */ @@ -728,7 +739,8 @@ sysctl_str(const char *buf, const char *arg, char *var, size_t varsz) return (-1); } - printf("%s: %s -> %s\n", buf, prev, tmp); + if (arg != NULL) + printf("%s: %s -> %s\n", buf, prev, tmp); if (var != NULL) strlcpy(var, tmp, varsz); free(tmp);