[PATCH 11/15] crypto/dpaa2_sec: fix crypto op pointer for atomic and ordered queues

[Hemant Agrawal]

Replace Akhil with your name. 

> -----Original Message-----
> From: Gagandeep Singh <G.Singh at nxp.com>
> Sent: Thursday, April 21, 2022 5:31 PM
> To: dpdk-up <dpdk-up at NXP1.onmicrosoft.com>
> Cc: Akhil Goyal (OSS) <akhil.goyal at oss.nxp.com>; stable at dpdk.org;
> Gagandeep Singh <G.Singh at nxp.com>
> Subject: [PATCH 11/15] crypto/dpaa2_sec: fix crypto op pointer for atomic
> and ordered queues
> 
> From: Akhil Goyal <akhil.goyal at oss.nxp.com>
> 
> Driver is filling the crypto_op variable with an invalid value which can results
> into segmentation fault.
> 
> This patch assigning the correct crypto_op and event buffer pointers by
> extracting from FD.
> 
> Fixes: a77db24643b7 ("crypto/dpaa2_sec: support atomic queues")
> Fixes: 4562de326d30 ("crypto/dpaa2_sec: support ordered queue")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Akhil Goyal <akhil.goyal at oss.nxp.com>
> Signed-off-by: Gagandeep Singh <g.singh at nxp.com>
> ---
>  drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 10 ++++++----
>  1 file changed, 6 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> index 86c8df241b..9f2b384af9 100644
> --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c
> @@ -4019,7 +4019,7 @@ dpaa2_sec_process_atomic_event(struct
> qbman_swp *swp __rte_unused,  {
>  	uint8_t dqrr_index;
>  	struct dpaa2_sec_qp *qp;
> -	struct rte_crypto_op *crypto_op = (struct rte_crypto_op *)ev-
> >event_ptr;
> +	struct rte_crypto_op *crypto_op;
>  	/* Prefetching mbuf */
>  	rte_prefetch0((void *)(size_t)(DPAA2_GET_FD_ADDR(fd)-
> 
> 	rte_dpaa2_bpid_info[DPAA2_GET_FD_BPID(fd)].meta_data_size));
> @@ -4036,12 +4036,13 @@ dpaa2_sec_process_atomic_event(struct
> qbman_swp *swp __rte_unused,
>  	ev->queue_id = rxq->ev.queue_id;
>  	ev->priority = rxq->ev.priority;
> 
> -	ev->event_ptr = sec_fd_to_mbuf(fd, qp);
> +	crypto_op = sec_fd_to_mbuf(fd, qp);
>  	dqrr_index = qbman_get_dqrr_idx(dq);
>  	*dpaa2_seqn(crypto_op->sym->m_src) =
> QBMAN_ENQUEUE_FLAG_DCA | dqrr_index;
>  	DPAA2_PER_LCORE_DQRR_SIZE++;
>  	DPAA2_PER_LCORE_DQRR_HELD |= 1 << dqrr_index;
>  	DPAA2_PER_LCORE_DQRR_MBUF(dqrr_index) = crypto_op->sym-
> >m_src;
> +	ev->event_ptr = crypto_op;
>  }
> 
>  static void __rte_hot
> @@ -4051,7 +4052,7 @@ dpaa2_sec_process_ordered_event(struct
> qbman_swp *swp,
>  				struct dpaa2_queue *rxq,
>  				struct rte_event *ev)
>  {
> -	struct rte_crypto_op *crypto_op = (struct rte_crypto_op *)ev-
> >event_ptr;
> +	struct rte_crypto_op *crypto_op;
>  	struct dpaa2_sec_qp *qp;
> 
>  	/* Prefetching mbuf */
> @@ -4069,7 +4070,7 @@ dpaa2_sec_process_ordered_event(struct
> qbman_swp *swp,
>  	ev->sched_type = rxq->ev.sched_type;
>  	ev->queue_id = rxq->ev.queue_id;
>  	ev->priority = rxq->ev.priority;
> -	ev->event_ptr = sec_fd_to_mbuf(fd, qp);
> +	crypto_op = sec_fd_to_mbuf(fd, qp);
> 
>  	*dpaa2_seqn(crypto_op->sym->m_src) =
> DPAA2_ENQUEUE_FLAG_ORP;
>  	*dpaa2_seqn(crypto_op->sym->m_src) |=
> qbman_result_DQ_odpid(dq) << @@ -4078,6 +4079,7 @@
> dpaa2_sec_process_ordered_event(struct qbman_swp *swp,
>  		DPAA2_EQCR_SEQNUM_SHIFT;
> 
>  	qbman_swp_dqrr_consume(swp, dq);
> +	ev->event_ptr = crypto_op;
>  }
> 
>  int
> --
> 2.25.1