1 files changed, 19 insertions, 0 deletions

diff --git a/drivers/net/hyperv/rndis_filter.c b/drivers/net/hyperv/rndis_filter.c
index da181f9a49d1..dc2e3849573b 100644
--- a/drivers/net/hyperv/rndis_filter.c
+++ b/drivers/net/hyperv/rndis_filter.c
@@ -321,6 +321,25 @@ static void rndis_filter_receive_data(struct rndis_device *dev,
         data_offset = RNDIS_HEADER_SIZE + rndis_pkt->data_offset;
 
         pkt->total_data_buflen -= data_offset;
+
+        /*
+         * Make sure we got a valid RNDIS message, now total_data_buflen
+         * should be the data packet size plus the trailer padding size
+         */
+        if (pkt->total_data_buflen < rndis_pkt->data_len) {
+                netdev_err(dev->net_dev->ndev, "rndis message buffer "
+                           "overflow detected (got %u, min %u)"
+                           "...dropping this message!\n",
+                           pkt->total_data_buflen, rndis_pkt->data_len);
+                return;
+        }
+
+        /*
+         * Remove the rndis trailer padding from rndis packet message
+         * rndis_pkt->data_len tell us the real data length, we only copy
+         * the data packet to the stack, without the rndis trailer padding
+         */
+        pkt->total_data_buflen = rndis_pkt->data_len;
         pkt->data = (void *)((unsigned long)pkt->data + data_offset);
 
         pkt->is_data_pkt = true;