diff options
author | Matias Elo <matias.elo@nokia.com> | 2023-04-14 11:20:49 +0300 |
---|---|---|
committer | Matias Elo <matias.elo@nokia.com> | 2023-04-18 14:23:54 +0300 |
commit | fded8d59df3658a9e27644af3100a16148792834 (patch) | |
tree | 16dfc62d15f7a034361bea99a25504606c49f647 /platform/linux-dpdk | |
parent | 9cb6de7bf9698e1d771cdc93e450ca2c2b7b3def (diff) |
Port 83593b790 "linux-gen: crypto: fix uninitialized variable access"
Port original commit from linux-generic.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Tuomas Taipale <tuomas.taipale@nokia.com>
Diffstat (limited to 'platform/linux-dpdk')
-rw-r--r-- | platform/linux-dpdk/odp_crypto.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/platform/linux-dpdk/odp_crypto.c b/platform/linux-dpdk/odp_crypto.c index 6c76144f2..84a761d2f 100644 --- a/platform/linux-dpdk/odp_crypto.c +++ b/platform/linux-dpdk/odp_crypto.c @@ -1782,9 +1782,6 @@ static odp_packet_t get_output_packet(const crypto_session_entry_t *session, { int rc; - if (odp_likely(session->p.op_type == ODP_CRYPTO_OP_TYPE_BASIC)) - return pkt_in; - if (odp_likely(pkt_in == pkt_out)) return pkt_out; @@ -1842,11 +1839,15 @@ static int op_alloc(crypto_op_t *op[], session = (crypto_session_entry_t *)(intptr_t)param[n].session; _ODP_ASSERT(session != NULL); - pkt = get_output_packet(session, pkt_in[n], pkt_out[n]); - if (odp_unlikely(pkt == ODP_PACKET_INVALID)) { - for (int i = n; i < num_pkts; i++) - rte_crypto_op_free((struct rte_crypto_op *)op[i]); - break; + if (odp_likely(session->p.op_type == ODP_CRYPTO_OP_TYPE_BASIC)) { + pkt = pkt_in[n]; + } else { + pkt = get_output_packet(session, pkt_in[n], pkt_out[n]); + if (odp_unlikely(pkt == ODP_PACKET_INVALID)) { + for (int i = n; i < num_pkts; i++) + rte_crypto_op_free((struct rte_crypto_op *)op[i]); + break; + } } op[n]->state.pkt = pkt; } |