From nobody Sat Sep 23 16:23:53 2023 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 4RtDwV0TNRz4ttRj; Sat, 23 Sep 2023 16:23:54 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RtDwT734kz4Qnl; Sat, 23 Sep 2023 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486234; 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=sEzYtgEpf/6yFRs6Gb/NK7yq24/DLYMaVcBc8gMInOU=; b=BT4ehdTQup5dn3DEF0irbdnnFwgXsEAQ1vJ4ATa7Wd5BhtW1sRw/sDyH8lRUkJcLinwJCG Fs2fvcMpXmc6XdvkuyitQF1+VUFKO4cCdWTad3lpX8FI24j7x/kX4pIcfGU7P6lNVFM7UP E98dYrLT6h+C1uvbMjlxe+4/aSiPJWloQovFSuniZ9SC8gjcZWmzhDaBd5Q78EApSaFhD3 mnHx+PVH9FrLRZUjayyOltp8phyiOhKOHNZTud6uxi2n5RcTye2ecT4QPb8FKE7Ai5f3G6 YyZyE4xRwc9ywxVvW+Y7sqzFjW7lF/4ys5tpc/CCEFqPQ8d7xQNhKf6RNxa0OA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695486234; a=rsa-sha256; cv=none; b=KQRqh7bBlQ6pbWw7PlVm/MndpH7AxIpN433JH3xM06KRXqGeeR4fH/8w7yIYeJ62z6vCc+ hgL3xhqU5e/qqUqppN18TmVKj2oUGObVlMTRrDV0bQoa/oBv1PLtrmiAOEUNUzazO+xsRd gK0k6rkEL6DLUbbtRyJfpqsW2S7NOblSYrXnjoleKnv4d6W8ZqXqCWiRjh2snFchwlN4fz VI5KOe1ZUYvz2IzvcVLDKw5OziBxb13auCZOnzp6ihvd2RsGU6IUjhPLFchtA4w+BYZM9z CXl8CatHED5z1DnrnqjvpVTGDoOBZbqBKW7KiafDVNii6LiUTRYWTJCqV47nRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695486234; 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=sEzYtgEpf/6yFRs6Gb/NK7yq24/DLYMaVcBc8gMInOU=; b=ZKjXEXY4dKUxaeosuLTk+N/4yMyj6cnyuxSJAyGzQx7g0fP0oa/nBqJ5Vj3/Jzkmt2R+mF /lFb/x9IQMt0lTb1NJa8jnnR3JG9PuUIcircEOhX+cDd7M0loT1g9UNKDepLqTdTCEAVMo SnGqjCSHws5NSQHH+rz4Iu3MY6tGp9mlkIe/tDGc6P0syEBc+V+QD+0rkgh+f4R3iPx0zO YGEoUNW4bVtfJmawhHpr3U4GouDj+fIIH6JJkPQf7ieOWIu6OfHVH2+JIEgxPzZc8RdwEB PyX7e/2HgS+fWRg8gpNQKQJ7k+hV4fP97eO3gtMbKDsRRwfA1mTcqmGVCDs/Hg== 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 4RtDwT65wjz19mk; Sat, 23 Sep 2023 16:23:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38NGNrAP003929; Sat, 23 Sep 2023 16:23:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38NGNrmQ003926; Sat, 23 Sep 2023 16:23:53 GMT (envelope-from git) Date: Sat, 23 Sep 2023 16:23:53 GMT Message-Id: <202309231623.38NGNrmQ003926@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Motin Subject: git: f80babf906b7 - main - kern_sysctl: Make name2oid() non-destructive to the name 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f80babf906b7be51b2a031ef26525893c7bf4e31 Auto-Submitted: auto-generated The branch main has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=f80babf906b7be51b2a031ef26525893c7bf4e31 commit f80babf906b7be51b2a031ef26525893c7bf4e31 Author: Alexander Motin AuthorDate: 2023-09-23 16:13:46 +0000 Commit: Alexander Motin CommitDate: 2023-09-23 16:13:46 +0000 kern_sysctl: Make name2oid() non-destructive to the name It is not the first time I see it panicking while trying to modify const memory. Lets make it safer and easier to use. While there, mark few functions using it also const. MFC after: 10 days --- sys/kern/kern_sysctl.c | 34 +++++++++++++++++++++++++++------- 1 file changed, 27 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 780eb6099b07..a4bfe8e21aed 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -127,7 +127,7 @@ static int sysctl_remove_oid_locked(struct sysctl_oid *oidp, int del, int recurse); static int sysctl_old_kernel(struct sysctl_req *, const void *, size_t); static int sysctl_new_kernel(struct sysctl_req *, void *, size_t); -static int name2oid(char *, int *, int *, struct sysctl_oid **); +static int name2oid(const char *, int *, int *, struct sysctl_oid **); static struct sysctl_oid * sysctl_find_oidname(const char *name, struct sysctl_oid_list *list) @@ -143,6 +143,21 @@ sysctl_find_oidname(const char *name, struct sysctl_oid_list *list) return (NULL); } +static struct sysctl_oid * +sysctl_find_oidnamelen(const char *name, size_t len, + struct sysctl_oid_list *list) +{ + struct sysctl_oid *oidp; + + SYSCTL_ASSERT_LOCKED(); + SYSCTL_FOREACH(oidp, list) { + if (strncmp(oidp->oid_name, name, len) == 0 && + oidp->oid_name[len] == '\0') + return (oidp); + } + return (NULL); +} + /* * Initialization of the MIB tree. * @@ -978,7 +993,7 @@ SYSINIT(sysctl, SI_SUB_KMEM, SI_ORDER_FIRST, sysctl_register_all, NULL); #ifdef VIMAGE static void -sysctl_setenv_vnet(void *arg __unused, char *name) +sysctl_setenv_vnet(void *arg __unused, const char *name) { struct sysctl_oid *oidp; int oid[CTL_MAXNAME]; @@ -1001,7 +1016,7 @@ out: } static void -sysctl_unsetenv_vnet(void *arg __unused, char *name) +sysctl_unsetenv_vnet(void *arg __unused, const char *name) { struct sysctl_oid *oidp; int oid[CTL_MAXNAME]; @@ -1419,21 +1434,26 @@ static SYSCTL_NODE(_sysctl, CTL_SYSCTL_NEXTNOSKIP, nextnoskip, CTLFLAG_RD | CTLFLAG_MPSAFE | CTLFLAG_CAPRD, sysctl_sysctl_next, ""); static int -name2oid(char *name, int *oid, int *len, struct sysctl_oid **oidpp) +name2oid(const char *name, int *oid, int *len, struct sysctl_oid **oidpp) { struct sysctl_oid *oidp; struct sysctl_oid_list *lsp = &sysctl__children; + const char *n; SYSCTL_ASSERT_LOCKED(); for (*len = 0; *len < CTL_MAXNAME;) { - oidp = sysctl_find_oidname(strsep(&name, "."), lsp); + n = strchrnul(name, '.'); + oidp = sysctl_find_oidnamelen(name, n - name, lsp); if (oidp == NULL) return (ENOENT); *oid++ = oidp->oid_number; (*len)++; - if (name == NULL || *name == '\0') { + name = n; + if (*name == '.') + name++; + if (*name == '\0') { if (oidpp) *oidpp = oidp; return (0); @@ -2999,7 +3019,7 @@ db_show_sysctl_all(int *oid, size_t len, int flags) * Show a sysctl by its user facing string */ static int -db_sysctlbyname(char *name, int flags) +db_sysctlbyname(const char *name, int flags) { struct sysctl_oid *oidp; int oid[CTL_MAXNAME];