From patchwork Thu Nov 2 23:02:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 133795 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A1AAD4324A; Fri, 3 Nov 2023 00:03:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D23FD41151; Fri, 3 Nov 2023 00:03:15 +0100 (CET) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mails.dpdk.org (Postfix) with ESMTP id E202E4021E for ; Fri, 3 Nov 2023 00:03:12 +0100 (CET) Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-6b497c8575aso1593141b3a.1 for ; Thu, 02 Nov 2023 16:03:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1698966192; x=1699570992; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=GxuFlYqL3HY+3JBgyysKTUCIfXDTjA7u/A/GQRdHitw=; b=czO862k5r0zP0hYJWF4wdM3APLNJvRxxokRIfHEBg3ItWU4gTWIVv/nVzrW1vtt/+O 52rw6UPr0ZB4svv4WQc7kpNQW0zORYlMbHubS/7SLwRdZRCBOZS0Y53lMGQ+PYe4Oi5Q 0MzbpFqyLbVbQedD9JmyZMmyuUICmvu+QPOqa9RNfbidTTbusaBsugg7/pvpy3Ma0tOQ me+Tf4gk8RzOWkMPU2/R2fs16Q66YRh1qiGuF3rKiy6MyDtso3rV2AQHymnB9hoVYrLA F01f51g3/x/BPixjn6UScEaygXQTNFztowHAcvo4ZVDiKLl2JPMR8jVmFh2gawWFN/TO do4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698966192; x=1699570992; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GxuFlYqL3HY+3JBgyysKTUCIfXDTjA7u/A/GQRdHitw=; b=ioAeNbW+9DbLjzIvQRCJKVvbgMG2PiCw2isv1BibQ+4Sc93PaRt/8kdMT/lLs4svT9 eLfQu3xaCU2XlYqgTpegDg6zX73hNnjf8m07ivay554myBIMTw0oP1lRC180re4c3BML 5vITZXlmTDX8rbEceXbKRyJqmfYUSInS8szGqYzxVAt/0buP80gsDWd2t68+nwNsUZIn SNvhV1op7EzyE4KPvP39dYu9Uqgk0J34ioDsm2otwhtf55uFAwLodONNOnBp0bKih8OO 6m0BYkgZX3FWVWualRUGJoKvi8xv3YSx7vZ+ztjNBqmrMC/+il0U+MaSXIlcnNfuFWFA DZIA== X-Gm-Message-State: AOJu0YyY2M0Ir1rhrlMJHQpV8OFmJtgriRQYBb53n6Ae7Io7LUDHt0Bv p9l+flooJY24BEAf+MKw4ngHPIl16MmEKA4ltOLIKDAb X-Google-Smtp-Source: AGHT+IEU/G2l8hIFklxmyaGvqv4CxAiRTKH96nGXbVRwgd6zrnZa9JYJ1vNaChoGJOUkB5nyLd21hA== X-Received: by 2002:a05:6a21:33a4:b0:14c:c393:692 with SMTP id yy36-20020a056a2133a400b0014cc3930692mr23602188pzb.7.1698966191718; Thu, 02 Nov 2023 16:03:11 -0700 (PDT) Received: from fedora.. ([38.142.2.14]) by smtp.gmail.com with ESMTPSA id a24-20020a63cd58000000b005bd3d6e270dsm223192pgj.68.2023.11.02.16.03.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 16:03:11 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH 1/2] nullfree: add matches for null free cases from OpenSSL Date: Thu, 2 Nov 2023 16:02:05 -0700 Message-ID: <20231102230307.6138-2-stephen@networkplumber.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231102230307.6138-1-stephen@networkplumber.org> References: <20231102230307.6138-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org OpenSSL functions follow the design parameter that free of NULL is ok. Signed-off-by: Stephen Hemminger --- devtools/cocci/nullfree.cocci | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/devtools/cocci/nullfree.cocci b/devtools/cocci/nullfree.cocci index 9ca3fc2864..c58aad4fb7 100644 --- a/devtools/cocci/nullfree.cocci +++ b/devtools/cocci/nullfree.cocci @@ -126,4 +126,13 @@ expression E; | - if (E != NULL) trie_free(E); + trie_free(E); +| +- if (E != NULL) EVP_PKEY_CTX_free(E); ++ EVP_PKEY_CTX_free(E); +| +- if (E != NULL) EVP_PKEY_free(E); ++ EVP_PKEY_free(E); +| +- if (E != NULL) BN_free(E); ++ BN_free(E); ) From patchwork Thu Nov 2 23:02:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hemminger X-Patchwork-Id: 133796 X-Patchwork-Delegate: gakhil@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id ED11B4324A; Fri, 3 Nov 2023 00:03:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 155C142D7B; Fri, 3 Nov 2023 00:03:17 +0100 (CET) Received: from mail-il1-f177.google.com (mail-il1-f177.google.com [209.85.166.177]) by mails.dpdk.org (Postfix) with ESMTP id 0F4CD402CE for ; Fri, 3 Nov 2023 00:03:14 +0100 (CET) Received: by mail-il1-f177.google.com with SMTP id e9e14a558f8ab-35961c61febso1007975ab.1 for ; Thu, 02 Nov 2023 16:03:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1698966193; x=1699570993; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4DcHsZZy0nSgqGVb7rSrFR3hEAK7gZREZ3JF6J9bVVY=; b=R4gV6mvb8YnkRGnDTry1hFiVPM3lCN1xIzn6XqObZW5xVP9u1L4lqVNyWq0Ll1U+WT /T+2NW/bZfLDR0rgSHPbPm6uocLKRK8JN8aSMbPG6nM5MnhiFPbQ3BAtNUW/6DKPgLY8 zIDkMlJ4saoOD97DCQt2ykB2mvRpVa4m+NLEGGRJBuOdGbFPaeiNj+UqXluOrwa0s9qm AByfcqxe1AhIghiqsVTXn8KWHH3uTru3VeO3wwXcwR5e4ltRwvJdltzeoQ2TWjoNdq3h VImUE6FWiPp7JlCrE6oeWvdSbpFN0GE4qfnE4Bv6nd/h+wvxz5Q7R3RuPUuVzzNpPQy5 Aqqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698966193; x=1699570993; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4DcHsZZy0nSgqGVb7rSrFR3hEAK7gZREZ3JF6J9bVVY=; b=B+c24OJbrtIoYZ1AfCMhOTycG7Sx77eRfwPRCNOjCSHCIgJ0qu4rykpoAlCIglp+G8 JHOgqU7mSQzzbunpcQAZVSxh2CFiCu3QUkS44hlyC1E9+ZtXRjVWrOqDLrybde0J+RMp l9b9d6ku/h8hZpDXDSR1xxrzR0C7yhaL9ROp35IkAO5hsSJKRNBBL40PKYdkg1cpkE1b yAJ0kLltUjEJHr8snUbyh+oCJf/pEaeXo4MvBBjJJYO27BRCdWezlkYjVGKMolaVsOyy qadoTZOdA9v03seGCq59+6hGXHMyfkM23xkAmmpi+dR6BpKLSeZz3aE4J836ep3bYxZX 4rwQ== X-Gm-Message-State: AOJu0Yw6dv/U9Wbs3v7IV+IebxF6Fa/jmwy+lZAYlE3uat6g5RsSrQQD 0bzZzTdE087su31a5pwHi9T8hDKr+IwrotIVKyOB26S2 X-Google-Smtp-Source: AGHT+IEKNISW2RRCryRSWpS/cnOViCfYD/gR9Zr97jUhjeyiU8PyM0zZPCy4Qgp6ogWVInC9yiwPgw== X-Received: by 2002:a05:6e02:1526:b0:357:f72d:ad1d with SMTP id i6-20020a056e02152600b00357f72dad1dmr23719247ilu.30.1698966193051; Thu, 02 Nov 2023 16:03:13 -0700 (PDT) Received: from fedora.. ([38.142.2.14]) by smtp.gmail.com with ESMTPSA id a24-20020a63cd58000000b005bd3d6e270dsm223192pgj.68.2023.11.02.16.03.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 16:03:12 -0700 (PDT) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger , Kai Ji Subject: [PATCH 2/2] crypto/openssl: remove unnecessary NULL checks before free Date: Thu, 2 Nov 2023 16:02:06 -0700 Message-ID: <20231102230307.6138-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231102230307.6138-1-stephen@networkplumber.org> References: <20231102230307.6138-1-stephen@networkplumber.org> MIME-Version: 1.0 X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Found with nullfree.cocci Signed-off-by: Stephen Hemminger Acked-by: Kai Ji --- drivers/crypto/openssl/rte_openssl_pmd.c | 36 +++++++------------- drivers/crypto/openssl/rte_openssl_pmd_ops.c | 3 +- 2 files changed, 13 insertions(+), 26 deletions(-) diff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c index c234882417..090320602d 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd.c +++ b/drivers/crypto/openssl/rte_openssl_pmd.c @@ -1957,10 +1957,8 @@ process_openssl_dsa_sign_op_evp(struct rte_crypto_op *cop, err_dsa_sign: if (params) OSSL_PARAM_free(params); - if (key_ctx) - EVP_PKEY_CTX_free(key_ctx); - if (dsa_ctx) - EVP_PKEY_CTX_free(dsa_ctx); + EVP_PKEY_CTX_free(key_ctx); + EVP_PKEY_CTX_free(dsa_ctx); return -1; } @@ -2039,10 +2037,8 @@ process_openssl_dsa_verify_op_evp(struct rte_crypto_op *cop, DSA_SIG_free(sign); if (params) OSSL_PARAM_free(params); - if (key_ctx) - EVP_PKEY_CTX_free(key_ctx); - if (dsa_ctx) - EVP_PKEY_CTX_free(dsa_ctx); + EVP_PKEY_CTX_free(key_ctx); + EVP_PKEY_CTX_free(dsa_ctx); return ret; } @@ -2294,16 +2290,12 @@ process_openssl_dh_op_evp(struct rte_crypto_op *cop, ret = 0; err_dh: - if (pub_key) - BN_free(pub_key); - if (priv_key) - BN_free(priv_key); + BN_free(pub_key); + BN_free(priv_key); if (params) OSSL_PARAM_free(params); - if (dhpkey) - EVP_PKEY_free(dhpkey); - if (peerkey) - EVP_PKEY_free(peerkey); + EVP_PKEY_free(dhpkey); + EVP_PKEY_free(peerkey); EVP_PKEY_CTX_free(dh_ctx); @@ -2880,17 +2872,13 @@ process_openssl_sm2_op_evp(struct rte_crypto_op *cop, ret = 0; cop->status = RTE_CRYPTO_OP_STATUS_SUCCESS; err_sm2: - if (kctx) - EVP_PKEY_CTX_free(kctx); + EVP_PKEY_CTX_free(kctx); - if (sctx) - EVP_PKEY_CTX_free(sctx); + EVP_PKEY_CTX_free(sctx); - if (cctx) - EVP_PKEY_CTX_free(cctx); + EVP_PKEY_CTX_free(cctx); - if (pkey) - EVP_PKEY_free(pkey); + EVP_PKEY_free(pkey); return ret; } diff --git a/drivers/crypto/openssl/rte_openssl_pmd_ops.c b/drivers/crypto/openssl/rte_openssl_pmd_ops.c index 2862c294a9..419a767817 100644 --- a/drivers/crypto/openssl/rte_openssl_pmd_ops.c +++ b/drivers/crypto/openssl/rte_openssl_pmd_ops.c @@ -1431,8 +1431,7 @@ static void openssl_reset_asym_session(struct openssl_asym_session *sess) switch (sess->xfrm_type) { case RTE_CRYPTO_ASYM_XFORM_RSA: #if (OPENSSL_VERSION_NUMBER >= 0x30000000L) - if (sess->u.r.ctx) - EVP_PKEY_CTX_free(sess->u.r.ctx); + EVP_PKEY_CTX_free(sess->u.r.ctx); #else if (sess->u.r.rsa) RSA_free(sess->u.r.rsa);