From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id A1A02A0527 for ; Wed, 25 Nov 2020 10:03:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 99B3CC95C; Wed, 25 Nov 2020 10:03:37 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 1A534C95C for ; Wed, 25 Nov 2020 10:03:36 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id w24so1407254wmi.0 for ; Wed, 25 Nov 2020 01:03:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=b3rL23INiMOZvWjv8imEQfosOib2blx6uEWWKI43z68=; b=V8EvhiQzUf4afVAow+pi2X2TPQT8NZPl1csAuY+mMZZ+L60koMl47dEnVP7SD3imXn BMjwNL6e7BjDuvLQ474n4xy0k/KLKGEDZ99woa7LkEi/Bq8rJDDkb/2wuoz2idBcEX0U jdeUfa/Zw7bvpiNA5n0rMins14ES5mz9mNBvOMNipSt6n3v1kF7uIhX386PhnOsD2m9N Vhd9gABriZSnUeGs4UGejgG0WzOQV9zFQNQfvUuxAvjdFA3+IwDcQkKzwsWS4doyqWhG Qm7gOUWzFAc9owkpdPnUh0eYMb7bVzQjDR5anlpCLaSDpv/x+G2NZPNc3E+gZasx91BM s47Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=b3rL23INiMOZvWjv8imEQfosOib2blx6uEWWKI43z68=; b=H1oTOJDKPvSrRwXrJ3gfvRNcAPP6MQ8/N6ZXedJ4FTT8GvfvAwEyMwAADVYJtc1V1Y DHxxTK5l8y093cJAF0OTztZ8pcwndUbFi85YnuUyYaKkJFD85wYvkXHG96PDAe27g6FJ UgC/OLbopDGh7dc96a7v2uPBoPxOfpvLDX0iK2G0s0jHrmyW3cJILPJuRpWhZdPXX9kM 0ukHweuINmux0Gxoc77pFYMfo0qWL2zqrm2EFmtpdOY4Obe49beQEA3AQg3RzYiTTbNc bQ6eEBqGAkGrUIpNjF2R0JlXhZMO+ES5prM+vxrtc6GvT0/2wPaVRw0tXdJ85J3pEdKK GDQA== X-Gm-Message-State: AOAM530rt6Hlh7xdI0x5L13kgKFGaBBtIxu9Gna+KUuznZ4Lyg7VmYl5 +M/z3a8jspRlBTBP0JAus4U= X-Google-Smtp-Source: ABdhPJy6UeIFe+eYZKvapWJtk/ajgDaIeuJnRNeePJ2D27aj7BHiPkRIuEAMwnSqvQoNIDQWmcmZHA== X-Received: by 2002:a7b:c101:: with SMTP id w1mr2739713wmi.170.1606295015891; Wed, 25 Nov 2020 01:03:35 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id o21sm3605854wra.40.2020.11.25.01.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 Nov 2020 01:03:35 -0800 (PST) From: luca.boccassi@gmail.com To: Yunjian Wang Cc: Lee Daly , dpdk stable Date: Wed, 25 Nov 2020 09:02:53 +0000 Message-Id: <20201125090258.21457-11-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201125090258.21457-1-luca.boccassi@gmail.com> References: <20201117111416.1961049-42-luca.boccassi@gmail.com> <20201125090258.21457-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'compress/isal: check allocation in queue setup' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/26/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/3c163ed8106a391cf04fc865d4a5088ce3f25bb6 Thanks. Luca Boccassi --- >From 3c163ed8106a391cf04fc865d4a5088ce3f25bb6 Mon Sep 17 00:00:00 2001 From: Yunjian Wang Date: Mon, 2 Nov 2020 19:36:24 +0800 Subject: [PATCH] compress/isal: check allocation in queue setup [ upstream commit e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 ] The function rte_zmalloc() could return NULL, the return value need to be checked. Fixes: dc49e6aa4879 ("compress/isal: add ISA-L compression functionality") Fixes: 7bf4f0630af6 ("compress/isal: add ISA-L decomp functionality") Signed-off-by: Yunjian Wang Acked-by: Lee Daly --- drivers/compress/isal/isal_compress_pmd_ops.c | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/compress/isal/isal_compress_pmd_ops.c b/drivers/compress/isal/isal_compress_pmd_ops.c index 31c4559915..7d03749da3 100644 --- a/drivers/compress/isal/isal_compress_pmd_ops.c +++ b/drivers/compress/isal/isal_compress_pmd_ops.c @@ -249,16 +249,27 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, qp->stream = rte_zmalloc_socket("Isa-l compression stream ", sizeof(struct isal_zstream), RTE_CACHE_LINE_SIZE, socket_id); - + if (qp->stream == NULL) { + ISAL_PMD_LOG(ERR, "Failed to allocate compression stream memory"); + goto qp_setup_cleanup; + } /* Initialize memory for compression level buffer */ qp->stream->level_buf = rte_zmalloc_socket("Isa-l compression lev_buf", ISAL_DEF_LVL3_DEFAULT, RTE_CACHE_LINE_SIZE, socket_id); + if (qp->stream->level_buf == NULL) { + ISAL_PMD_LOG(ERR, "Failed to allocate compression level_buf memory"); + goto qp_setup_cleanup; + } /* Initialize memory for decompression state structure */ qp->state = rte_zmalloc_socket("Isa-l decompression state", sizeof(struct inflate_state), RTE_CACHE_LINE_SIZE, socket_id); + if (qp->state == NULL) { + ISAL_PMD_LOG(ERR, "Failed to allocate decompression state memory"); + goto qp_setup_cleanup; + } qp->id = qp_id; dev->data->queue_pairs[qp_id] = qp; @@ -284,8 +295,11 @@ isal_comp_pmd_qp_setup(struct rte_compressdev *dev, uint16_t qp_id, return 0; qp_setup_cleanup: - if (qp) - rte_free(qp); + if (qp->stream) + rte_free(qp->stream->level_buf); + rte_free(qp->stream); + rte_free(qp->state); + rte_free(qp); return -1; } -- 2.27.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-24 16:50:37.031972475 +0000 +++ 0011-compress-isal-check-allocation-in-queue-setup.patch 2020-11-24 16:50:36.569496315 +0000 @@ -1 +1 @@ -From e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 Mon Sep 17 00:00:00 2001 +From 3c163ed8106a391cf04fc865d4a5088ce3f25bb6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit e816f5ede5acb09f0eb6bf7c42837c4a0d9f77f2 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org