Re: [PATCH] vhost-vdpa: Fix some error handling path in vhost_vdpa_process_iotlb_msg()

From: Stefano Garzarella
Date: Mon May 23 2022 - 06:34:05 EST


On Mon, May 23, 2022 at 12:41:03PM +0800, Jason Wang wrote:
On Sun, May 22, 2022 at 9:59 PM Christophe JAILLET
<christophe.jaillet@xxxxxxxxxx> wrote:

In the error paths introduced by the commit in the Fixes tag, a mutex may
be left locked.
Add the correct goto instead of a direct return.

Fixes: a1468175bb17 ("vhost-vdpa: support ASID based IOTLB API")
Signed-off-by: Christophe JAILLET <christophe.jaillet@xxxxxxxxxx>
---
WARNING: This patch only fixes the goto vs return mix-up in this function.
However, the 2nd hunk looks really spurious to me. I think that the:
- return -EINVAL;
+ r = -EINVAL;
+ goto unlock;
should be done only in the 'if (!iotlb)' block.

It should be fine, the error happen if

1) the batched ASID based request is not equal (the first if)
2) there's no IOTLB for this ASID (the second if)

But I agree the code could be tweaked to use two different if instead
of using a or condition here.

Yeah, I think so!

Anyway, this patch LGTM:

Reviewed-by: Stefano Garzarella <sgarzare@xxxxxxxxxx>