From nobody Thu May 23 05:37:24 2024 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 4VlH4P00MZz5H9pc; Thu, 23 May 2024 05:37:25 +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 4VlH4N6Y9qz4PYX; Thu, 23 May 2024 05:37:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716442644; 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=TfbWhQ/LvatT1kBz9TdWyNNyT91BJUA8IwqAUzbmjKY=; b=CJejoij/Q5joiVtHlhP49ufJQElLw3oemVMVLUmSVV6FA0/L/G57ll6YcoJPV0o0pQjkum +XGxgtASkukI3+To0hqMau/99U+Tus9b72O14XdgYpYgDh63nwhE0dVB+sYZGktWAEEGiU iQrnWdDYyagMxLoTzy9L1SWW3PQfFm9g9+R8YA+gs5EiOqLipAcmSFhs3wQ+LxMH+VFJbn K/vwfAFX1Oe+bStwXINIy0b7p1lHwhhSXMhNJdLDzSUziI5Ex1p7jiq2MnWmpEkDUplsNq W8aHXSHgwcD/M6/o27wuLzpfygNJLDIu64nD2fI/yjHm9KJiBM5lusKBzVUfcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716442644; a=rsa-sha256; cv=none; b=ExTwG1dL6dYuL2Shhl1uHAx8LO5rSZWQHZ1W2+UEpUUfh1qHBKPjs6BuAhhNnSTUOpkSHx 8+aud4tQOhsfgkyTlNkH1twJ9kMWq3++z5o5lKFJS7FFLGkX//THRJDB923x9jm4xYL9U7 50dJ9AHBvDU0Q4IjwnHFn7fPFwUxe9y/IDY/lAwFpGDyaYX/ZMvxdhlW44LBI9BKWO9+zt TPjLaQ5d5TnaOAUvFkiL4pJNVuljXYif7PYBnDmy2X9Jl7tZsMqWL4150XiZKHOFt7RhcY iBWwoMgXCc8EyefH2XbF7hkmaBwSE8b7kgk2WTqe9CBwkke1odiXB9DM2Vislw== 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=1716442644; 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=TfbWhQ/LvatT1kBz9TdWyNNyT91BJUA8IwqAUzbmjKY=; b=XO4QYlZHJRHIAA9ViHwc9AUZwQVasnvbUH+/ZaUoCys+P7shkCfqhzigRekK0R8x9MMD68 b7uJpdk1/VyjRidW0qV51rgpQan8sL7EuZOBXP6fo5uegiUrbxLYsCWSu9EBhDa2M1ypet HdPXG2qluxXyPIcnJpkFW8MgIfkiRaQpOz+eGkk8Ix0rlYPUV3EWkorZD8P2YALqSaJT/5 E9osicQHmPaYOJx2O0vdlbgjewqqLBOqYOtnRaz9+YJ90xvbSx78c/NWcdxcRHnbjfk66i wH6q/jeP3V6FppQ73w9O7na9JXhTk8XRY6dopJW7iDCbrCW2itpgTmcQ8sUG9Q== 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 4VlH4N67Sszcd0; Thu, 23 May 2024 05:37:24 +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 44N5bOCk047845; Thu, 23 May 2024 05:37:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44N5bO8X047842; Thu, 23 May 2024 05:37:24 GMT (envelope-from git) Date: Thu, 23 May 2024 05:37:24 GMT Message-Id: <202405230537.44N5bO8X047842@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Marko Zec Subject: git: 78782f3dd2f2 - releng/14.1 - fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zec X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.1 X-Git-Reftype: branch X-Git-Commit: 78782f3dd2f27b5665abcb94a04584bd68900da0 Auto-Submitted: auto-generated The branch releng/14.1 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=78782f3dd2f27b5665abcb94a04584bd68900da0 commit 78782f3dd2f27b5665abcb94a04584bd68900da0 Author: Marko Zec AuthorDate: 2024-05-06 18:34:11 +0000 Commit: Marko Zec CommitDate: 2024-05-23 04:26:37 +0000 fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. MFC after: 1 week Approved by: re (cperciva) (cherry picked from commit 64136682ba1681e56093f77b4cec8bdfa6375a72) --- sys/netinet/in_fib_dxr.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/sys/netinet/in_fib_dxr.c b/sys/netinet/in_fib_dxr.c index c4815a64b260..f7840858f9c9 100644 --- a/sys/netinet/in_fib_dxr.c +++ b/sys/netinet/in_fib_dxr.c @@ -1142,14 +1142,11 @@ static void dxr_destroy(void *data) { struct dxr *dxr = data; - struct dxr_aux *da; + struct dxr_aux *da = dxr->aux; struct chunk_desc *cdp; struct trie_desc *tp; - if (dxr->d != NULL) - free(dxr->d, M_DXRLPM); - - da = dxr->aux; + free(dxr->d, M_DXRLPM); free(dxr, M_DXRAUX); if (da == NULL || atomic_fetchadd_int(&da->refcnt, -1) > 1)