From nobody Tue May 14 20:38:52 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 4Vf7Vh5m0Gz5Kyvv; Tue, 14 May 2024 20:38:52 +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 4Vf7Vh4ltnz4JfN; Tue, 14 May 2024 20:38:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715719132; 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=N9O/+LWKwITGIKwC8fFLekHX72JFxA87Cgxuy+C99qM=; b=E7IR+eWmF2G1uKzIneVX3R5eN34gSXCPua/oAfQYF/LY5/CIE0bkv4noVaXafgqnIsTAlh JV+0LSszRY/elgrd3O8ttXyBLOLDEbbzchflkMWOz1wKwZNX4hwJfofsfjtT3ntU2GJDMX xxz9sM9wRtqvjgZamBtRKHWEoOA+eTTpq5sD5jiDkmeyuBkhT3uFqMzQW/FIEzpjJVSU6/ /m6cJzPTmslcaRQ80SiUT6IEM+9ZTjQXAVd9UTTV8Z9V3OQRrRww9GUp9HzUduqc17OvYA DzbfKGNBf3YSvBFVzuRd7i5mUlKS5hcIJV4PZOpOXmeW+5l3R+ZjiFC9ugymLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715719132; a=rsa-sha256; cv=none; b=jLIP7SU8ohaqHNcm5TWP56NYLWpvepoqpArSs1v4EXZeGIRSsVJNHV5l2h40D9uCJEsLJw TwEQyy3/6Rqn7MdWjG2Pph4HNHj2NAU8V8OKdn8MMqcJM6/Pa8Jqrynh/YmdkuymQ5mhD+ tHqu1UAVrrZRs9MmOspsNDRtL0ZbC4Llep4WaaCgzaxO7+U4h+wdiwiceZoCOCCxg6BzMi af0UL/gKNCxUdo7yOHg9fUbuV+q4XlDDeDqZCNqhw9o6EpQtlWhfpkMO1IVQye+HapsNsZ eEtZ+FRBAPYedT9N2Q7LuclFuwPWIDy2zWfX+injLISJWp1Cwue6YDktV7ycbw== 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=1715719132; 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=N9O/+LWKwITGIKwC8fFLekHX72JFxA87Cgxuy+C99qM=; b=qoitDhH9XglA6jY7d0ls/NKmbMT+Q8gFhxAejijn0u9uTwtRXFNdWacBfem6X7znbkDwt8 8F/8QL2/Gc6gV53VP8OCOpLIkI8fht+XYm9tnUPr2CwiyNx7C6/ZD/SmypzF7I/7umyhZI XgeoCJAUmuVcEjdYwW2RLUjsO/RMsT1Snsgf/L9/cYPSloz6jygegimdZGT/AzNDAYlB8i tvyD6Bb+cafshWWjz83xtKbcgyuXm9fodYoY79vARCDVuT2i5/mX4pD68a74AsrrXZBvwx enK5fIrUTabIJiIK5mVZ6hl1ZSmEL1Aafifceq8u41Z/dO4mjSQ8fdOFcmr8MQ== 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 4Vf7Vh4MLZzmCl; Tue, 14 May 2024 20:38:52 +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 44EKcqxV092279; Tue, 14 May 2024 20:38:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44EKcqrL092276; Tue, 14 May 2024 20:38:52 GMT (envelope-from git) Date: Tue, 14 May 2024 20:38:52 GMT Message-Id: <202405142038.44EKcqrL092276@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: 64136682ba16 - stable/14 - 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 64136682ba1681e56093f77b4cec8bdfa6375a72 Auto-Submitted: auto-generated The branch stable/14 has been updated by zec: URL: https://cgit.FreeBSD.org/src/commit/?id=64136682ba1681e56093f77b4cec8bdfa6375a72 commit 64136682ba1681e56093f77b4cec8bdfa6375a72 Author: Marko Zec AuthorDate: 2024-05-06 18:34:11 +0000 Commit: Marko Zec CommitDate: 2024-05-14 20:31:24 +0000 fib_dxr: free() does nothing if arg is NULL, so remove a redundant check. MFC after: 1 week --- 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 db4f4a537e22..55f79994f552 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)