diff --git a/0046-nfp-verify-strdup-return.patch b/0046-nfp-verify-strdup-return.patch new file mode 100644 index 0000000000000000000000000000000000000000..aa2ef905190267a4d292533dfc021557af128a15 --- /dev/null +++ b/0046-nfp-verify-strdup-return.patch @@ -0,0 +1,36 @@ +From 4ea9eeb66170b30eb5bf02f91531f08aecd13298 Mon Sep 17 00:00:00 2001 +From: Chengwen Feng +Date: Fri, 10 Nov 2023 10:01:09 +0000 +Subject: [PATCH] net/nfp: verify strdup return + +Add verify strdup return value logic. + +Fixes: 3d21da66c06b ("net/nfp: create security session") +Cc: stable@dpdk.org + +Signed-off-by: Chengwen Feng +Acked-by: Chaoyong He + +--- + drivers/net/nfp/nfp_ipsec.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/drivers/net/nfp/nfp_ipsec.c b/drivers/net/nfp/nfp_ipsec.c +index 4529473..7ce9cca 100644 +--- a/drivers/net/nfp/nfp_ipsec.c ++++ b/drivers/net/nfp/nfp_ipsec.c +@@ -524,6 +524,11 @@ nfp_aesgcm_iv_update(struct ipsec_add_sa *cfg, + uint8_t *cfg_iv; + + iv_str = strdup(iv_string); ++ if (iv_str == NULL) { ++ PMD_DRV_LOG(ERR, "Failed to strdup iv_string"); ++ return; ++ } ++ + cfg_iv = (uint8_t *)cfg->aesgcm_fields.iv; + + for (i = 0; i < iv_len; i++) { +-- +2.27.0 + diff --git a/dpdk.spec b/dpdk.spec index 91a366a8c0d837681b6e48cc201a402d7be81833..40c831f6e8d7f13aa3d742d91261044806a69a33 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -10,7 +10,7 @@ Name: dpdk Version: 23.11 -Release: 19 +Release: 20 URL: http://dpdk.org Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz @@ -70,6 +70,7 @@ Patch9037: 0043-remove-symbol-for-examples-and-app.patch Patch6044: 0044-net-hns3-support-more-VLAN-fields-matching.patch Patch6045: 0045-net-hns3-add-Rx-DMA-address-align-check.patch +Patch6046: 0046-nfp-verify-strdup-return.patch BuildRequires: meson BuildRequires: python3-pyelftools @@ -266,6 +267,9 @@ strip -g $RPM_BUILD_ROOT/lib/modules/%{kern_devel_ver}/extra/dpdk/igb_uio.ko %endif %changelog +* Thu Aug 15 2024 yanshuai - 23.11-20 +- net/nfp: verify strdup return + * Tue Jul 23 2024 huangdengdui - 23.11-19 Support more VLAN fields matching for hns3 and sync a bugfix - net/hns3: add Rx DMA address align check