From nobody Thu Dec 9 00:24:08 2021 X-Original-To: dev-commits-src-branches@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 A10F218C0B84; Thu, 9 Dec 2021 00:24:09 +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 4J8ZXT2Hk8z4pN8; Thu, 9 Dec 2021 00:24:09 +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 2A2F41CEC5; Thu, 9 Dec 2021 00:24:09 +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 1B90O8Lu064272; Thu, 9 Dec 2021 00:24:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B90O8hh064271; Thu, 9 Dec 2021 00:24:08 GMT (envelope-from git) Date: Thu, 9 Dec 2021 00:24:08 GMT Message-Id: <202112090024.1B90O8hh064271@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: ed43c7ac0a8c - stable/13 - procstat_getfiles_sysctl: do not require non-null ki_fd List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/13 X-Git-Reftype: branch X-Git-Commit: ed43c7ac0a8c29510a42b56f79a7db32855e9821 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639009449; 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=5dfZuRggXkjDIroAhZG2aXBxoIW7siW3BzEVLYeIVug=; b=ECkfyKBoZ/4BDSXvZwUxqUIZ7IWPvM9hVkAv3FHJp1gpPV6XWE3GPQc+iH+u9QPtLbeltR neWUBqtHUn61mcnpaSCbx7tcYZ9SMRRTR04Xuaca0tlfSrO+ZKlXb8xMYW1MhG2q1ALnWx jgLM9LVm3oMYrPppjKnNQ82/A/IzAzEDzWyJNOIf7gQPZnn1HKwpH/pCPzg4HWUWeQnwHX FEUmWudnVenmAroveFVj5xyfLjalfeUog6AVrDWnaHQsyKjLIg4rmR9mzU57msOb6ELtTN vTfPJwhax+JtqGhyWqAn3tWLkga7VxrfGYxhwD7hc9+FVWzGxykl5PnZvfNrdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639009449; a=rsa-sha256; cv=none; b=AZlcGKwFgVjWrSZ9ePzlhraiCcWRJcmf9HWDLNoq+KKwdfTD/bshlY1NWAn8LLRcZKM472 9TGQRRX/FqOx7mn26mY+fMjj4f/pN0LZXliXGBGJlsk3iLWXWEnCqFF9FwlKymaFmqMbaL XGFR9eobSu5m5USIafcpz3UUj/z0S812IJtkE26JT6xUNsvmz/77fAEj8vJ0dX8GPDTTwh h9OgLjSu1AGSzEbXa+Y8/amu3BmcxqmQAXU0urq9CLb9l7vnL5d2hwA3yHjXXV01RR0yBX 2NmToCufKxwWGHUovz8aiNMjasG8W8YFg7wMljP9nMjKmJyD3kpCxPcA5bnraA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed43c7ac0a8c29510a42b56f79a7db32855e9821 commit ed43c7ac0a8c29510a42b56f79a7db32855e9821 Author: Konstantin Belousov AuthorDate: 2021-12-02 18:03:01 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-09 00:23:29 +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 176c2b7f8c6f..89896a813888 100644 --- a/lib/libprocstat/libprocstat.c +++ b/lib/libprocstat/libprocstat.c @@ -868,8 +868,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);