Re: [PATCH 4/5] scsi: ufs: rpmb: Validate frame before parsing

[Bart Van Assche <bvanassche@acm.org>]

On 7/15/26 11:19 PM, liqiang wrote:
> From: Li Qiang <liqiang01@kylinos.cn>
> 
> The RPMB core only verifies that request and response buffers are
> nonempty. This callback reads req_resp at the end of the first request
> frame before validating the request length.
> 
> Require a complete frame before that access. Use unaligned accessors
> because RPMB buffers are passed as u8 pointers and do not have an
> alignment guarantee.
> 
> Fixes: b06b8c421485 ("scsi: ufs: core: Add OP-TEE based RPMB driver for UFS devices")
> Signed-off-by: Li Qiang <liqiang01@kylinos.cn>
> ---
>   drivers/ufs/core/ufs-rpmb.c | 8 ++++++--
>   1 file changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/ufs/core/ufs-rpmb.c b/drivers/ufs/core/ufs-rpmb.c
> index ffad049872b9..53f66b274aca 100644
> --- a/drivers/ufs/core/ufs-rpmb.c
> +++ b/drivers/ufs/core/ufs-rpmb.c
> @@ -69,7 +69,11 @@ static int ufs_rpmb_route_frames(struct device *dev, u8 *req, unsigned int req_l
>   
>   	hba = ufs_rpmb->hba;
>   
> -	req_type = be16_to_cpu(frm_out->req_resp);
> +	/* req_resp is at the end of an RPMB frame. */
> +	if (req_len < sizeof(*frm_out))
> +		return -EINVAL;
> +
> +	req_type = get_unaligned_be16(&frm_out->req_resp);
>   
>   	switch (req_type) {
>   	case RPMB_PROGRAM_KEY:
> @@ -107,7 +111,7 @@ static int ufs_rpmb_route_frames(struct device *dev, u8 *req, unsigned int req_l
>   		struct rpmb_frame *frm_resp = (struct rpmb_frame *)resp;
>   
>   		memset(frm_resp, 0, sizeof(*frm_resp));
> -		frm_resp->req_resp = cpu_to_be16(RPMB_RESULT_READ);
> +		put_unaligned_be16(RPMB_RESULT_READ, &frm_resp->req_resp);
>   		ret = ufs_sec_submit(hba, protocol_id, resp, resp_len, true);
>   		if (ret) {
>   			dev_err(dev, "Result read request failed with ret=%d\n", ret);

Please split this patch into two patches because the two above changes 
are independent of each other.

Thanks,

Bart.