From nobody Fri Sep 16 20:25:42 2022 X-Original-To: dev-commits-src-main@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 4MTlvC4pn8z4d6rm; Fri, 16 Sep 2022 20:25:43 +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 4MTlvC0YHXz3Mhs; Fri, 16 Sep 2022 20:25:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663359943; 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=D1SNEnnlPw7fn/fYDQoSn5odLaolAYIjHzMa967tIxg=; b=S4eHpHudtMIlzFThFlFUIYCeP9JxU58w9HkgEA90yKa2sWVfXBvKkQr1F54fXR0fz8+eDA q0psX6P3IpKaqoRFRKT2APxDNBJtIs7BkWmKf/FHBVpKPer1IHjTRz+aEZ288JuBjr/PM3 /7H8Iyt8ZEpWN0ht5Bs65z7lASsYAGAh9sjIqBQMi0RiNwiKQxoPzJNToNNIGPWRmczHxz nXdf155/xiybX7HQGN9aP/+DMmkmDSs0ujNiXd495SW7osKcLJKPEMqVoQxqOn259JAyeu 7lCaXcq0ex+VKV5ac4KRaSu9C4m8qIkOtHQ5JUYHE2Zw94UBZqnr78geSqz6lg== 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 4MTlvB6mQXzT4F; Fri, 16 Sep 2022 20:25:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28GKPg53026436; Fri, 16 Sep 2022 20:25:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28GKPgve026435; Fri, 16 Sep 2022 20:25:42 GMT (envelope-from git) Date: Fri, 16 Sep 2022 20:25:42 GMT Message-Id: <202209162025.28GKPgve026435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ebf7a01594ee - main - libthr: use nitems() for mib length List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ebf7a01594eeb8c2897d1b310069df35da112413 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663359943; 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=D1SNEnnlPw7fn/fYDQoSn5odLaolAYIjHzMa967tIxg=; b=YhLqPwzjc+klkbVbdjGLt6dUkhvNvJ7jAKli8YhczOvVzh6l/36zKg/FvGXxCYCPD8xKbH /iB4C2ijgLZ73xOqC9KnZ/jaaw5YPs5KTSxnd2SrRKRKuq4Ao7bZz/o+Hjz+CgJpBZJ7IN jvXH3Jln0uezFU2TqDIulPFoeQbG7oSXinmbFIt+UGdw50oWMreQAU8ZIZBbxbLL4wnLoT myjf+CUy1vzOeKCmwXz1hd9dz+NjXY3bIurZXhElv+Xe2XIu4FCP7XYUbJRD1WTMmLWacD xVdtqH/jy/FXUgiANi+h4n5zzhvq5Jp2go4DRu8cCgKRZ5Zymtng5O2shW6oaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663359943; a=rsa-sha256; cv=none; b=cdt1GTZTV61TcQ1MxtUn1XAMWN0YFdLv/qWZR+loOkV67I0OH5xhRzNGyyJYm1I8tGuqP3 QnxyJOF/VVOPdsI90+YASr430NZzXpqPeneX6YtDLBSxTdjR/vcPRfht7PL+v4vHViTzj7 UHg9AHDt42joAMP9gKOh5+l+L24q3yLLfaotrsDkm6oOmpsJvN3Ifzwzkl7EuCxjvf42mP jCv0SBG+c29bnHUwsTEqVV/ret4VYnUZZ/j1TkfDJbagaU7bXMaKddAAt5F9aGfa8t6i/G 7PxBsYjHcuFpxwMQ6PKqtJA3WDDeScfAlMowqvCyousJu13oSDi14vBIye1+MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ebf7a01594eeb8c2897d1b310069df35da112413 commit ebf7a01594eeb8c2897d1b310069df35da112413 Author: Konstantin Belousov AuthorDate: 2022-09-12 20:24:55 +0000 Commit: Konstantin Belousov CommitDate: 2022-09-16 20:23:59 +0000 libthr: use nitems() for mib length Suggested by: imp Reviewed by: brooks, imp (previous version) Discussed with: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D36540 --- lib/libc/gen/elf_utils.c | 4 ++-- lib/libthr/thread/thr_init.c | 4 ++-- lib/libthr/thread/thr_stack.c | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/lib/libc/gen/elf_utils.c b/lib/libc/gen/elf_utils.c index fbf3bf17082c..ea5cc25f8601 100644 --- a/lib/libc/gen/elf_utils.c +++ b/lib/libc/gen/elf_utils.c @@ -28,7 +28,7 @@ * $FreeBSD$ */ -#include +#include #include #include #include @@ -83,7 +83,7 @@ __libc_map_stacks_exec(void) mib[0] = CTL_KERN; mib[1] = KERN_USRSTACK; len = sizeof(usrstack); - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0) + if (sysctl(mib, nitems(mib), &usrstack, &len, NULL, 0) == -1) return; if (getrlimit(RLIMIT_STACK, &rlim) == -1) diff --git a/lib/libthr/thread/thr_init.c b/lib/libthr/thread/thr_init.c index 82bde10a153e..0ab051e57994 100644 --- a/lib/libthr/thread/thr_init.c +++ b/lib/libthr/thread/thr_init.c @@ -37,7 +37,7 @@ __FBSDID("$FreeBSD$"); #include "namespace.h" -#include +#include #include #include #include @@ -466,7 +466,7 @@ init_private(void) mib[0] = CTL_KERN; mib[1] = KERN_USRSTACK; len = sizeof (_usrstack); - if (sysctl(mib, 2, &_usrstack, &len, NULL, 0) == -1) + if (sysctl(mib, nitems(mib), &_usrstack, &len, NULL, 0) == -1) PANIC("Cannot get kern.usrstack from sysctl"); env_bigstack = getenv("LIBPTHREAD_BIGSTACK_MAIN"); env_splitstack = getenv("LIBPTHREAD_SPLITSTACK_MAIN"); diff --git a/lib/libthr/thread/thr_stack.c b/lib/libthr/thread/thr_stack.c index b08bafdd9417..af396fe2ba93 100644 --- a/lib/libthr/thread/thr_stack.c +++ b/lib/libthr/thread/thr_stack.c @@ -30,7 +30,7 @@ #include __FBSDID("$FreeBSD$"); -#include +#include #include #include #include @@ -155,8 +155,7 @@ singlethread_map_stacks_exec(void) mib[0] = CTL_KERN; mib[1] = KERN_USRSTACK; len = sizeof(usrstack); - if (sysctl(mib, sizeof(mib) / sizeof(mib[0]), &usrstack, &len, NULL, 0) - == -1) + if (sysctl(mib, nitems(mib), &usrstack, &len, NULL, 0) == -1) return; if (getrlimit(RLIMIT_STACK, &rlim) == -1) return;