From nobody Thu Dec 09 00:33:41 2021 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 F33DE18C29AE; Thu, 9 Dec 2021 00:33:42 +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 4J8ZlV1SXbz4r36; Thu, 9 Dec 2021 00:33:42 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 EDE8D1D1B3; Thu, 9 Dec 2021 00:33:41 +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 1B90Xfs2078264; Thu, 9 Dec 2021 00:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B90Xfu9078263; Thu, 9 Dec 2021 00:33:41 GMT (envelope-from git) Date: Thu, 9 Dec 2021 00:33:41 GMT Message-Id: <202112090033.1B90Xfu9078263@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: deb027e9ed66 - stable/12 - procstat_getfiles_sysctl: do not require non-null ki_fd 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: deb027e9ed66d2cc4aa1cb55b7e0c1847b370c83 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639010022; 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=pwXmjOxgF2mZaneovOzVEocFfacTIHLpqLyLeE4jWdM=; b=koLr587TgUgoq1v6ZIRwaoXhXEmrIEk4zH9dSbeHFxScRY50gvRTqmGGEcFzns014DeVT9 rzki072Cm+gOkl78eUhc/XvfSL1q3C30fG2lMh6eCSh+3nF1hs6pPVyp8GZqu/OUJ+t7zz ofsVKdzR2N/8Pezt7zTkaIcZI79OrCP28aTTX5ulqGhsO/DriiDrSITDgJX6BbP4mh789v +t+40CYmLaXNEtHS2My0wHbC3Ncp8fk3/SfGaUoJfxWKD22vg5IEQ1w8R3CGRYSWmTujkW G72ulUkHF3Ry0OjG9UbRcmexEQR1cW46O351uxEgzL6KjlNIf+5yqohgbqLBJw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639010022; a=rsa-sha256; cv=none; b=ng1DJ6gPE/661G+rInVOgs4n5IHppO/AlFGyx8wjQQu9LDKNDudsWK71DhAEZgnuNR8P7I uzYV9kzJzTzGbB4Ukamt1cZ/4YHUEktT0voYve0nRhn5SmRLSbPcm91OQMiExl+SSz681x bxzCKiy+PPA6aziLRtP6c9IhOYmyYbKi1eGU5qumHjRohKxVMzAWBlrwIp6m16hIoDbjKk BBPJs2LeH9gc7AaANl77QqoNOgWViMwc05b+5lDW15mGOjEa1MeFqslfapYionfAafa0Qi Hrw6DEaNxYUYds58rU9e9njytaupBYQCkSXt1wR9nL9ExthzYnRJEprdVGyhmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/12 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=deb027e9ed66d2cc4aa1cb55b7e0c1847b370c83 commit deb027e9ed66d2cc4aa1cb55b7e0c1847b370c83 Author: Konstantin Belousov AuthorDate: 2021-12-02 18:03:01 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-09 00:32:47 +0000 procstat_getfiles_sysctl: do not require non-null ki_fd PR: 260174 (cherry picked from commit 7a9423d6f360e3758ca67fbb25d309140ea93670) --- lib/libprocstat/libprocstat.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libprocstat/libprocstat.c b/lib/libprocstat/libprocstat.c index 6f74d5876b42..ba8767c61508 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -832,8 +832,6 @@ procstat_getfiles_sysctl(struct procstat *procstat, struct kinfo_proc *kp, cap_rights_t cap_rights; assert(kp); - if (kp->ki_fd == NULL) - return (NULL); switch (procstat->type) { case PROCSTAT_SYSCTL: files = kinfo_getfile(kp->ki_pid, &cnt);