From nobody Sat Oct 01 17:21:54 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 4Mfv6B71XGz4d5F8; Sat, 1 Oct 2022 17:21: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 4Mfv6B6ZqSz47jc; Sat, 1 Oct 2022 17:21:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664644914; 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=gE79BOmjpRZotPq+qJuCLPqi5TH/uOJuOuWE7FBhy74=; b=RaGTzlrayWH5ky5nFUgjQL8/P/Czt4XmK1TuaT5Wwx14kIHYfyhcrnH1vodvFrbLQ9AN8E JOx1IY4TkLA+zGzl1RVXYwrvHvXisWtv1bb7yXfT+NmcIiRdBftlzkA+LnWMBoYcg/FubC H4XsSyDGBQq0VLIzDlVCx1QXc5feNnHyN9WbwP3uOkxVDB5MNL2iJNzc0fsdVsLr17cs7f EGICfZttC3Zcfjexaf5ZzKL03Fn2iAMLC4EUSxJZr6PggRwv5GeIxmbJURFuqr8lZ5iGaB QhXz+B2+xasnZC9U8PizYV06bt72XESHJT7oBEcx8ZxjnD+8wQ5dcC6yvRwx7A== 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 4Mfv6B5KrmzbYY; Sat, 1 Oct 2022 17:21:54 +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 291HLsLm034656; Sat, 1 Oct 2022 17:21:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 291HLsvu034655; Sat, 1 Oct 2022 17:21:54 GMT (envelope-from git) Date: Sat, 1 Oct 2022 17:21:54 GMT Message-Id: <202210011721.291HLsvu034655@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: e5f93d10782d - main - show_sysctl_all: reduce copying, please coverity 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: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5f93d10782dd804d0ee776c22b972ec582f5c99 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664644914; 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=gE79BOmjpRZotPq+qJuCLPqi5TH/uOJuOuWE7FBhy74=; b=T/pajVPRi6aRza4Cpcf7B/t1DSOBn29oMcHwXj+hXLeS/W0PDEZXrt+OcbVZKqiZTn/qjn OroMkPMi16+XqJQda9ZjfUhLDdcQQeT11G54Ow3I3aTxFk1li0S53IH2ttXH5PQUATriMu IuyoNsjDaKHwYnu24hhdlHoHyzhk+aFDrLGAmuD4J8O/DuaXRS8z32XJKXZ8o3gSoDcIop 0kZfREq1HdfwQhWI6PVqcu4n6AVM5NMM5jRY4/hsXYk2sWjaCQ/cs+iuP3twYGwNrfPeKu x8WzyBGSdQNzzjDCw7ZDiLWdIJuz1qEYmJ8ICN8mNEoctr4COZ87Y9K4qEiLYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664644914; a=rsa-sha256; cv=none; b=dVhUet616MkEzo07baduC0a8KbxVIstBs8znQebCy+RoBOzU62WD+gpyR3m30XrrzOUUiD K5Sgbt6HFK6FrdsqJmP7LXNU4Z6porIzFyVwNq3f5YvuzD28bz5GC3CpS0skaVEHQEh+aN XHjNI3MoVIDwCU6DHXhnosUP2dWm1aopacegKl/3i6an4F3qBlHCmh9sAEK2Qixz4m1c7t Jilqeac2hfKCMoa37jFnXL600yDbUj8dgO5Ar0pcOtAHVdu1idJDrw5Ca7waGYoDhZcxO3 oEIh4hbCNtRUO/RaaqUVn0j5whPiOImDCCjbeB7950oZY6xsBuHrD73o/cWXow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=e5f93d10782dd804d0ee776c22b972ec582f5c99 commit e5f93d10782dd804d0ee776c22b972ec582f5c99 Author: Doug Moore AuthorDate: 2022-10-01 17:20:04 +0000 Commit: Doug Moore CommitDate: 2022-10-01 17:20:04 +0000 show_sysctl_all: reduce copying, please coverity Modify db_show_sysctl_all so that it does not copy more than once the data of the input oid, and so that what it passes to db_show_oid does not alarm coverity. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D36847 --- sys/kern/kern_sysctl.c | 47 ++++++++++++++++++++++------------------------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/sys/kern/kern_sysctl.c b/sys/kern/kern_sysctl.c index 8e4b69bb6eee..6427ff0c7ecf 100644 --- a/sys/kern/kern_sysctl.c +++ b/sys/kern/kern_sysctl.c @@ -2765,12 +2765,12 @@ static void db_show_oid_name(int *oid, size_t nlen) { struct sysctl_oid *oidp; - int qoid[CTL_MAXNAME+2]; + int qoid[CTL_MAXNAME + 2]; int error; - qoid[0] = 0; + qoid[0] = CTL_SYSCTL; + qoid[1] = CTL_SYSCTL_NAME; memcpy(qoid + 2, oid, nlen * sizeof(int)); - qoid[1] = 1; error = sysctl_find_oid(qoid, nlen + 2, &oidp, NULL, NULL); if (error) @@ -2856,25 +2856,24 @@ static int db_show_sysctl_all(int *oid, size_t len, int flags) { struct sysctl_oid *oidp; - int name1[CTL_MAXNAME + 2], name2[CTL_MAXNAME + 2]; - size_t l1, l2; + int qoid[CTL_MAXNAME + 2], next[CTL_MAXNAME]; + size_t nlen; - name1[0] = CTL_SYSCTL; - name1[1] = CTL_SYSCTL_NEXT; - l1 = 2; + qoid[0] = CTL_SYSCTL; + qoid[1] = CTL_SYSCTL_NEXT; if (len) { - memcpy(name1 + 2, oid, len * sizeof(int)); - l1 += len; + nlen = len; + memcpy(&qoid[2], oid, nlen * sizeof(int)); } else { - name1[2] = CTL_KERN; - l1++; + nlen = 1; + qoid[2] = CTL_KERN; } for (;;) { - int i, error; + int error; + size_t nextsize = sizeof(next); - l2 = sizeof(name2); - error = kernel_sysctl(kdb_thread, name1, l1, - name2, &l2, NULL, 0, &l2, 0); + error = kernel_sysctl(kdb_thread, qoid, nlen + 2, + next, &nextsize, NULL, 0, &nlen, 0); if (error != 0) { if (error == ENOENT) return (0); @@ -2882,27 +2881,25 @@ db_show_sysctl_all(int *oid, size_t len, int flags) db_error("sysctl(next)"); } - l2 /= sizeof(int); + nlen /= sizeof(int); - if (l2 < (unsigned int)len) + if (nlen < (unsigned int)len) return (0); - for (i = 0; i < len; i++) - if (name2[i] != oid[i]) - return (0); + if (memcmp(&oid[0], &next[0], len * sizeof(int)) != 0) + return (0); /* Find the OID in question */ - error = sysctl_find_oid(name2, l2, &oidp, NULL, NULL); + error = sysctl_find_oid(next, nlen, &oidp, NULL, NULL); if (error) return (error); - i = db_show_oid(oidp, name2, l2, flags | DB_SYSCTL_SAFE_ONLY); + (void)db_show_oid(oidp, next, nlen, flags | DB_SYSCTL_SAFE_ONLY); if (db_pager_quit) return (0); - memcpy(name1+2, name2, l2 * sizeof(int)); - l1 = 2 + l2; + memcpy(&qoid[2 + len], &next[len], (nlen - len) * sizeof(int)); } }