Drivers: hv: vmbus: Copy packets sent by Hyper-V out of the ring buffer
Subsystems (6)
PATCH v3 1/1 Drivers: hv: vmbus: Copy packets sent by Hyper-V out of the ring buffer
From: Andres Beltran <[email protected]>
Pointers to ring-buffer packets sent by Hyper-V are used within the guest VM. Hyper-V can send packets with erroneous values or modify packet fields after they are processed by the guest. To defend against these scenarios, return a copy of the incoming VMBus packet after validating its length and offset fields in hv_pkt_iter_first(). In this way, the packet can no longer be modified by the host.
--- drivers/hv/channel.c | 9 ++-- drivers/hv/hv_fcopy.c | 1 + drivers/hv/hv_kvp.c | 1 + drivers/hv/hyperv_vmbus.h | 2 +- drivers/hv/ring_buffer.c | 82 ++++++++++++++++++++++++++----- drivers/net/hyperv/hyperv_net.h | 3 ++ drivers/net/hyperv/netvsc.c | 2 + drivers/net/hyperv/rndis_filter.c | 2 + drivers/scsi/storvsc_drv.c | 10 ++++ include/linux/hyperv.h | 48 +++++++++++++++--- net/vmw_vsock/hyperv_transport.c | 4 +- 11 files changed, 139 insertions(+), 25 deletions(-)
drivers/hv/channel.c +6 -3
@@ -597,12 +597,15 @@ static int __vmbus_open(struct vmbus_channel *newchannel, newchannel->onchannel_callback = onchannelcallback; newchannel->channel_callback_context = context; - err =hv_ringbuffer_init (&newchannel->outbound, page, send_pages); +if (!newchannel->max_pkt_size) + newchannel->max_pkt_size =VMBUS_DEFAULT_MAX_PKT_SIZE ; + + err =hv_ringbuffer_init (&newchannel->outbound, page, send_pages,0 );if (err) goto error_clean_ring; - err =hv_ringbuffer_init (&newchannel->inbound, - &page[send_pages], recv_pages); + err =hv_ringbuffer_init (&newchannel->inbound, &page[send_pages], + recv_pages, newchannel->max_pkt_size);if (err) goto error_clean_ring;
drivers/hv/hv_fcopy.c +1 -0
@@ -349,6 +349,7 @@ int hv_fcopy_init(struct hv_util_service *srv) { recv_buffer = srv->recv_buffer; fcopy_transaction.recv_channel = srv->channel; + fcopy_transaction.recv_channel->max_pkt_size =HV_HYP_PAGE_SIZE *2 ;/* * When this driver loads, the user level daemon that
drivers/hv/hv_kvp.c +1 -0
@@ -757,6 +757,7 @@ hv_kvp_init(struct hv_util_service *srv) { recv_buffer = srv->recv_buffer; kvp_transaction.recv_channel = srv->channel; + kvp_transaction.recv_channel->max_pkt_size =HV_HYP_PAGE_SIZE *4 ;/* * When this driver loads, the user level daemon that
drivers/hv/hyperv_vmbus.h +1 -1
@@ -174,7 +174,7 @@ extern int hv_synic_cleanup(unsigned int cpu);void hv_ringbuffer_pre_init (struct vmbus_channel *channel);int hv_ringbuffer_init (struct hv_ring_buffer_info *ring_info, -struct page *pages,u32 pagecnt); +struct page *pages,u32 pagecnt,u32 max_pkt_size);void hv_ringbuffer_cleanup (struct hv_ring_buffer_info *ring_info);
drivers/hv/ring_buffer.c +71 -11
134 lines not on this page · raw message
drivers/net/hyperv/hyperv_net.h +3 -0
@@ -860,9 +860,12 @@ static inline u32 netvsc_rqstor_size(unsigned long ringbytes) ringbytes /NETVSC_MIN_IN_MSG_SIZE ; } +#define NETVSC_MAX_XFER_PAGE_RANGES 375#define NETVSC_XFER_HEADER_SIZE (rng_cnt) \ (offsetof(struct vmtransfer_page_packet_header, ranges) + \ (rng_cnt) * sizeof(struct vmtransfer_page_range)) +#define NETVSC_MAX_PKT_SIZE (NETVSC_XFER_HEADER_SIZE(NETVSC_MAX_XFER_PAGE_RANGES) + \ + sizeof(struct nvsp_message) + (sizeof(u32) * VRSS_SEND_TAB_SIZE))struct multi_send_data {struct sk_buff *skb;/* skb containing the pkt */
drivers/net/hyperv/netvsc.c +2 -0
@@ -1530,6 +1530,8 @@ struct netvsc_device *netvsc_device_add(struct hv_device *device,/* Open the channel */ device->channel->rqstor_size =netvsc_rqstor_size (netvsc_ring_bytes); + device->channel->max_pkt_size =NETVSC_MAX_PKT_SIZE ; + ret =vmbus_open (device->channel, netvsc_ring_bytes, netvsc_ring_bytes,NULL ,0 , netvsc_channel_cb, net_device->chan_table);
drivers/net/hyperv/rndis_filter.c +2 -0
@@ -1173,6 +1173,8 @@ static void netvsc_sc_open(struct vmbus_channel *new_sc) nvchan->channel = new_sc; new_sc->rqstor_size =netvsc_rqstor_size (netvsc_ring_bytes); + new_sc->max_pkt_size =NETVSC_MAX_PKT_SIZE ; + ret =vmbus_open (new_sc, netvsc_ring_bytes, netvsc_ring_bytes,NULL ,0 , netvsc_channel_cb, nvchan);
drivers/scsi/storvsc_drv.c +10 -0
@@ -414,6 +414,14 @@ static void storvsc_on_channel_callback(void *context);#define STORVSC_IDE_MAX_TARGETS 1#define STORVSC_IDE_MAX_CHANNELS 1 +/* +* Upper bound on the size of a storvsc packet. vmscsi_size_delta is not +* included in the calculation because it is set after STORVSC_MAX_PKT_SIZE +* is used in storvsc_connect_to_vsp +*/ +#define STORVSC_MAX_PKT_SIZE (sizeof(struct vmpacket_descriptor) +\ + sizeof(struct vstor_packet)) +struct storvsc_cmd_request {struct scsi_cmnd *cmd;
@@ -698,6 +706,7 @@ static void handle_sc_creation(struct vmbus_channel *new_sc)return ;memset (&props,0 ,sizeof (struct vmstorage_channel_properties )); + new_sc->max_pkt_size =STORVSC_MAX_PKT_SIZE ;/* * The size of vmbus_requestor is an upper bound on the number of requests
@@ -1280,6 +1289,7 @@ static int storvsc_connect_to_vsp(struct hv_device *device, u32 ring_size,memset (&props,0 ,sizeof (struct vmstorage_channel_properties )); + device->channel->max_pkt_size =STORVSC_MAX_PKT_SIZE ;/* * The size of vmbus_requestor is an upper bound on the number of requests * that can be in-progress at any one time across all channels.
include/linux/hyperv.h +40 -8
90 lines not on this page · raw message
net/vmw_vsock/hyperv_transport.c +2 -2
@@ -600,7 +600,7 @@ static ssize_t hvs_stream_dequeue(struct vsock_sock *vsk, struct msghdr *msg,return -EOPNOTSUPP ;if (need_refill) { - hvs->recv_desc =hv_pkt_iter_first (hvs->chan); + hvs->recv_desc =hv_pkt_iter_first_raw (hvs->chan); ret =hvs_update_recv_data (hvs);if (ret)return ret;
@@ -614,7 +614,7 @@ static ssize_t hvs_stream_dequeue(struct vsock_sock *vsk, struct msghdr *msg, hvs->recv_data_len -= to_read;if (hvs->recv_data_len ==0 ) { - hvs->recv_desc =hv_pkt_iter_next (hvs->chan, hvs->recv_desc); + hvs->recv_desc =hv_pkt_iter_next_raw (hvs->chan, hvs->recv_desc);if (hvs->recv_desc) { ret =hvs_update_recv_data (hvs);if (ret)
Signature · 1 line
2.25.1
From: Andrea Parri (Microsoft) <[email protected]> Sent: Monday, December 7, 2020 8:53 PM
Quoted 19 lines
From: Andres Beltran <[email protected]>
Pointers to ring-buffer packets sent by Hyper-V are used within the guest VM. Hyper-V can send packets with erroneous values or modify packet fields after they are processed by the guest. To defend against these scenarios, return a copy of the incoming VMBus packet after validating its length and offset fields in
hv_pkt_iter_first(). In this way, the packet can no longer be modified by the host.Signed-off-by Andres Beltran <[email protected]>Co-developed-by Andrea Parri (Microsoft) <[email protected]>Signed-off-by Andrea Parri (Microsoft) <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc "James E.J. Bottomley" <[email protected]>Cc "Martin K. Petersen" <[email protected]>
Quoted 14 lines
--- drivers/hv/channel.c | 9 ++-- drivers/hv/hv_fcopy.c | 1 + drivers/hv/hv_kvp.c | 1 + drivers/hv/hyperv_vmbus.h | 2 +- drivers/hv/ring_buffer.c | 82 ++++++++++++++++++++++++++----- drivers/net/hyperv/hyperv_net.h | 3 ++ drivers/net/hyperv/netvsc.c | 2 + drivers/net/hyperv/rndis_filter.c | 2 + drivers/scsi/storvsc_drv.c | 10 ++++ include/linux/hyperv.h | 48 +++++++++++++++--- net/vmw_vsock/hyperv_transport.c | 4 +- 11 files changed, 139 insertions(+), 25 deletions(-)
Quoted 35 lines · Michael Kelley
From: Andrea Parri (Microsoft) <[email protected]> Sent: Monday, December 7, 2020 8:53 PM
Quoted 19 lines
From: Andres Beltran <[email protected]>
Pointers to ring-buffer packets sent by Hyper-V are used within the guest VM. Hyper-V can send packets with erroneous values or modify packet fields after they are processed by the guest. To defend against these scenarios, return a copy of the incoming VMBus packet after validating its length and offset fields in
hv_pkt_iter_first(). In this way, the packet can no longer be modified by the host.Signed-off-by Andres Beltran <[email protected]>Co-developed-by Andrea Parri (Microsoft) <[email protected]>Signed-off-by Andrea Parri (Microsoft) <[email protected]>Cc "David S. Miller" <[email protected]>Cc Jakub Kicinski <[email protected]>Cc "James E.J. Bottomley" <[email protected]>Cc "Martin K. Petersen" <[email protected]>Quoted 14 lines
--- drivers/hv/channel.c | 9 ++-- drivers/hv/hv_fcopy.c | 1 + drivers/hv/hv_kvp.c | 1 + drivers/hv/hyperv_vmbus.h | 2 +- drivers/hv/ring_buffer.c | 82 ++++++++++++++++++++++++++----- drivers/net/hyperv/hyperv_net.h | 3 ++ drivers/net/hyperv/netvsc.c | 2 + drivers/net/hyperv/rndis_filter.c | 2 + drivers/scsi/storvsc_drv.c | 10 ++++ include/linux/hyperv.h | 48 +++++++++++++++--- net/vmw_vsock/hyperv_transport.c | 4 +- 11 files changed, 139 insertions(+), 25 deletions(-)
Quoted 1 line
Reviewed-by Michael Kelley <[email protected]>
Applied to hyperv-next.