u32 msglen = hv_pkt_datalen(desc);
        struct nvsp_message *pkt_rqst;
        u64 cmd_rqst;
+       u32 status;
 
        /* First check if this is a VMBUS completion without data payload */
        if (!msglen) {
                break;
 
        case NVSP_MSG1_TYPE_SEND_RNDIS_PKT_COMPLETE:
+               if (msglen < sizeof(struct nvsp_message_header) +
+                   sizeof(struct nvsp_1_message_send_rndis_packet_complete)) {
+                       if (net_ratelimit())
+                               netdev_err(ndev, "nvsp_rndis_pkt_complete length too small: %u\n",
+                                          msglen);
+                       return;
+               }
+
+               /* If status indicates an error, output a message so we know
+                * there's a problem. But process the completion anyway so the
+                * resources are released.
+                */
+               status = nvsp_packet->msg.v1_msg.send_rndis_pkt_complete.status;
+               if (status != NVSP_STAT_SUCCESS && net_ratelimit())
+                       netdev_err(ndev, "nvsp_rndis_pkt_complete error status: %x\n",
+                                  status);
+
                netvsc_send_tx_complete(ndev, net_device, incoming_channel,
                                        desc, budget);
                break;