> -----Original Message----- > From: Maxime Coquelin <[email protected]> > Sent: Monday, July 26, 2021 3:58 PM > To: [email protected]; Xia, Chenbo <[email protected]>; Wang, Yinan > <[email protected]>; Ling, WeiX <[email protected]> > Cc: Maxime Coquelin <[email protected]>; [email protected] > Subject: [PATCH] vhost: fix crash on reconnect > > When the vhost-user frontend like Virtio-user tries to > reconnect to the restarted Vhost backend, the Vhost backend > segfaults when multiqueue is enabled. > > This is caused by VHOST_USER_GET_VRING_BASE being called for > a virtqueue that has not been created before, causing a NULL > pointer dereferencing. > > This patch adds the VHOST_USER_GET_VRING_BASE requests to > the list of requests that trigger queue pair allocations. > > Fixes: 160cbc815b41 ("vhost: remove a hack on queue allocation") > Cc: [email protected] > > Reported-by: Yinan Wang <[email protected]> > Signed-off-by: Maxime Coquelin <[email protected]> > --- > lib/vhost/vhost_user.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c > index 433f412fa8..29a4c9af60 100644 > --- a/lib/vhost/vhost_user.c > +++ b/lib/vhost/vhost_user.c > @@ -2796,6 +2796,7 @@ vhost_user_check_and_alloc_queue_pair(struct virtio_net > *dev, > break; > case VHOST_USER_SET_VRING_NUM: > case VHOST_USER_SET_VRING_BASE: > + case VHOST_USER_GET_VRING_BASE: > case VHOST_USER_SET_VRING_ENABLE: > vring_idx = msg->payload.state.index; > break; > -- > 2.31.1
Reviewed-by: Chenbo Xia <[email protected]>
