From nobody Wed May 21 19:31:36 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 4b2hPP0Zp9z5wPc4; Wed, 21 May 2025 19:31:37 +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 4b2hPN6d9wz3X4t; Wed, 21 May 2025 19:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855897; 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=bKJ7ajjFFrJspkKkwY5Pva2WbBonO/+t5wLZdfvGjHw=; b=b6rl/orrk0Bm+TNiue8taQLJlzAj3WkVgOuw9OWPPZhIto6Fb4JjsIHQP2NWXQq6bg0W2a OBMAjZ+rpb4Db20xS8mqyCwcXsHlNEB31dhKqg6eMrE+IuuOGSaWUtvJ9r/Ui1fcSNV39g VIpR0wSo5d+T0Su6hqAYBiWMINCcmQk0WB9JgsR4CSEjrcXZ6KwXTMlEMzr/w+j0FAN3aI axXfoIh1UwCRqqWcWMfPU7kTO5X3FAenfqu0M289jqY1KmGi8fz86xX2SqESAC/z5susFR BwlojvcZJG4THoOs27wYwS9aoM1v5TGclRUy8qtSlI4OMLt0RQr0Xo8uSjUkIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747855897; 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=bKJ7ajjFFrJspkKkwY5Pva2WbBonO/+t5wLZdfvGjHw=; b=meCKYRVxMqNos98z61cJz8PO6JosrzIIngaiY8QbMBYkovTQObEM86DjB2pMxBDenHUsv5 4gIpPs8+ChxL+iOXq5u0yeWL8n+9qnYzuoFLmyvEb5SSC/Ym7V/Fr5LgVTgc750g09DzI0 5Jf2D95Z73gJRYBhsNRuv2kGikfAf0l9fX5Vsuf0Q3GjPIqJZ5vQqtFAPyu87BFbyX8+F4 XGD0WeH2OXshVsBcZP99d/trfU0XUYzzmSr7P+DG5MRgbJeFzOqatZyARRybJLy9l7g7Zj IqUO5amy2CzagQOSbLg57MNHD3kCr/a8L/nkVEeBr8hDLRhxw7oJJ/2lyTeafw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747855897; a=rsa-sha256; cv=none; b=OhAmgtjcGvktAGYE+FSLS9Ha5wqsLOLgsMTK2chWj865zYfCZ/UaXfvlZwXvklejtIl509 tZQoSgQ9UwWfeTI+rgWFi1eKSHoQsi0kr+Uj+Gd3Gou2EnTZYPsKh+1QQ8OBpIHgBxu04s pJEE03sJVa9j+FSOhQxszbOLfZZcAfdiPJSBKKg9AoEvrEJXO1I8UqtHrt4N/mVvz6MBUx Kcdns/YPluCtcWoTHNSKV/u28bNUcWe9RXby/iU+OYpdXj/x3/3Q4CGHfmStM+7f3kukob 5iE4v3TUpc7N7fGAALyqof6rwatGV0nxSDVPVXdfxxVw8twONqyQi5p3bqq7VQ== 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 4b2hPN5ylFznxL; Wed, 21 May 2025 19:31:36 +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 54LJVasN077819; Wed, 21 May 2025 19:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LJVa0H077816; Wed, 21 May 2025 19:31:36 GMT (envelope-from git) Date: Wed, 21 May 2025 19:31:36 GMT Message-Id: <202505211931.54LJVa0H077816@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Christos Margiolis Subject: git: 52c426327403 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 52c4263274031d599aebfaed2862ae85b482953a Auto-Submitted: auto-generated The branch main has been updated by christos: URL: https://cgit.FreeBSD.org/src/commit/?id=52c4263274031d599aebfaed2862ae85b482953a commit 52c4263274031d599aebfaed2862ae85b482953a Author: Christos Margiolis AuthorDate: 2025-05-21 19:31:23 +0000 Commit: Christos Margiolis CommitDate: 2025-05-21 19:31:23 +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 --- 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);