Commit 30636258 authored by Heng Qi's avatar Heng Qi Committed by Jakub Kicinski
Browse files

virtio_net: fix missing lock protection on control_buf access 



Refactored the handling of control_buf to be within the cvq_lock
critical section, mitigating race conditions between reading device
responses and new command submissions.

Fixes: 6f45ab3e ("virtio_net: Add a lock for the command VQ.")
Signed-off-by: default avatarHeng Qi <hengqi@linux.alibaba.com>
Reviewed-by: default avatarHariprasad Kelam <hkelam@marvell.com>
Acked-by: default avatarJason Wang <jasowang@redhat.com>
Reviewed-by: default avatarXuan Zhuo <xuanzhuo@linux.alibaba.com>
Link: https://lore.kernel.org/r/20240530034143.19579-1-hengqi@linux.alibaba.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent d8ec1985

drivers/net/virtio_net.c

+3 −1
Original line number Diff line number Diff line
@@ -2686,6 +2686,7 @@ static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd 
{

	struct scatterlist *sgs[5], hdr, stat;

	u32 out_num = 0, tmp, in_num = 0;

	bool ok;

	int ret;



	/* Caller should know better */
@@ -2731,8 +2732,9 @@ static bool virtnet_send_command_reply(struct virtnet_info *vi, u8 class, u8 cmd 
	}



unlock:

	ok = vi->ctrl->status == VIRTIO_NET_OK;

	mutex_unlock(&vi->cvq_lock);

	return vi->ctrl->status == VIRTIO_NET_OK;

	return ok;

}



static bool virtnet_send_command(struct virtnet_info *vi, u8 class, u8 cmd,