|
@@ -282,6 +282,8 @@ static int netvsc_init_buf(struct hv_device *device,
|
|
|
goto cleanup;
|
|
|
}
|
|
|
|
|
|
+ net_device->recv_buf_size = buf_size;
|
|
|
+
|
|
|
/*
|
|
|
* Establish the gpadl handle for this buffer on this
|
|
|
* channel. Note: This call uses the vmbus connection rather
|
|
@@ -1095,11 +1097,22 @@ static int netvsc_receive(struct net_device *ndev,
|
|
|
|
|
|
/* Each range represents 1 RNDIS pkt that contains 1 ethernet frame */
|
|
|
for (i = 0; i < count; i++) {
|
|
|
- void *data = recv_buf
|
|
|
- + vmxferpage_packet->ranges[i].byte_offset;
|
|
|
+ u32 offset = vmxferpage_packet->ranges[i].byte_offset;
|
|
|
u32 buflen = vmxferpage_packet->ranges[i].byte_count;
|
|
|
+ void *data;
|
|
|
int ret;
|
|
|
|
|
|
+ if (unlikely(offset + buflen > net_device->recv_buf_size)) {
|
|
|
+ status = NVSP_STAT_FAIL;
|
|
|
+ netif_err(net_device_ctx, rx_err, ndev,
|
|
|
+ "Packet offset:%u + len:%u too big\n",
|
|
|
+ offset, buflen);
|
|
|
+
|
|
|
+ continue;
|
|
|
+ }
|
|
|
+
|
|
|
+ data = recv_buf + offset;
|
|
|
+
|
|
|
trace_rndis_recv(ndev, q_idx, data);
|
|
|
|
|
|
/* Pass it to the upper layer */
|