Skip to contentSkip to conversation

net/colo.c: Fix the pointer issuse reported by Coverity.

PATCH Superseded Zhang Chen 2 participants 3 messages Aug 5, 2022 – Aug 9, 2022 Networking

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore

Zhang Chen

author
#0 lore raw

PATCH v2 1/1 net/colo.c: Fix the pointer issuse reported by Coverity.

When enable the virtio-net-pci, guest network packet will load the vnet_hdr. In COLO status, the primary VM's network packet maybe redirect to another VM, it need filter-redirect enable the vnet_hdr flag at the same time, COLO-proxy will correctly parse the original network packet. If have any misconfiguration here, the vnet_hdr_len is wrong for parse the packet, the data+offset will point to wrong place.

---
 net/colo.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
net/colo.c +9 -8
index 6b0ff562ad..524afa3d9b 100644
@@ -44,21 +44,22 @@ int parse_packet_early(Packet *pkt)
 {
     int network_length;
     static const uint8_t vlan[] = {0x81, 0x00};
-    uint8_t *data = pkt->data + pkt->vnet_hdr_len;
+    uint8_t *data = pkt->data;
     uint16_t l3_proto;
     ssize_t l2hdr_len;
 
-    if (data == NULL) {
-        trace_colo_proxy_main_vnet_info("This packet is not parsed correctly, "
+    assert(data);
+
+    /* Check the received vnet_hdr_len then add the offset */
+    if (pkt->size < sizeof(struct eth_header) + sizeof(struct vlan_header)
+        + pkt->vnet_hdr_len) {
+        trace_colo_proxy_main_vnet_info("This packet may be load wrong "
                                         "pkt->vnet_hdr_len", pkt->vnet_hdr_len);
         return 1;
     }
-    l2hdr_len = eth_get_l2_hdr_length(data);
+    data += pkt->vnet_hdr_len;
 
-    if (pkt->size < ETH_HLEN + pkt->vnet_hdr_len) {
-        trace_colo_proxy_main("pkt->size < ETH_HLEN");
-        return 1;
-    }
+    l2hdr_len = eth_get_l2_hdr_length(data);
 
     /*
      * TODO: support vlan.
Signature · 1 line
2.25.1
#1 lore raw
Quoted 24 lines · Zhang Chen

When enable the virtio-net-pci, guest network packet will load the vnet_hdr. In COLO status, the primary VM's network packet maybe redirect to another VM, it need filter-redirect enable the vnet_hdr flag at the same time, COLO-proxy will correctly parse the original network packet. If have any misconfiguration here, the vnet_hdr_len is wrong for parse the packet, the data+offset will point to wrong place.

---
 net/colo.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
net/colo.c +1 -1
index 6b0ff562ad..524afa3d9b 100644
@@ -44,21 +44,22 @@ int parse_packet_early(Packet *pkt)
 {
     int network_length;
     static const uint8_t vlan[] = {0x81, 0x00};
-    uint8_t *data = pkt->data + pkt->vnet_hdr_len;
+    uint8_t *data = pkt->data;

net/colo.c int parse_packet_early(Packet *pkt) · line 55

Quoted 10 lines
net/colo.c +5 -2
     uint16_t l3_proto;
     ssize_t l2hdr_len;
 
-    if (data == NULL) {
-        trace_colo_proxy_main_vnet_info("This packet is not parsed correctly, "
+    assert(data);
+
+    /* Check the received vnet_hdr_len then add the offset */
+    if (pkt->size < sizeof(struct eth_header) + sizeof(struct vlan_header)
+        + pkt->vnet_hdr_len) {

I think this expression needs more care to avoid overflow with a maliciously over-large vnet_hdr_len value.

Casting pkt->vnet_hdr_len to int64_t would be one way to do that; there may be better approaches.

thanks
-- PMM

#2 lore raw
Quoted 46 lines

-----Original Message-----
From: Peter Maydell <[email protected]>
Sent: Friday, August 5, 2022 5:57 PM
To: Zhang, Chen <[email protected]>
Cc: Jason Wang <[email protected]>; Li Zhijian <[email protected]>; qemu-dev <[email protected]>
Subject: Re: [PATCH V2] net/colo.c: Fix the pointer issuse reported by Coverity.

Quoted 18 lines · Zhang Chen

When enable the virtio-net-pci, guest network packet will load the vnet_hdr. In COLO status, the primary VM's network packet maybe redirect to another VM, it need filter-redirect enable the vnet_hdr flag at the same time, COLO-proxy will correctly parse the original network packet. If have any misconfiguration here, the vnet_hdr_len is wrong for parse the packet, the data+offset will point to wrong place.

---
 net/colo.c | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)
net/colo.c +0 -0
index 6b0ff562ad..524afa3d9b 100644

net/colo.c int parse_packet_early(Packet *pkt) { · line 51

Quoted 9 lines
net/colo.c +1 -3
@@ -44,21 +44,22 @@ int parse_packet_early(Packet *pkt)  {
     int network_length;
     static const uint8_t vlan[] = {0x81, 0x00};
-    uint8_t *data = pkt->data + pkt->vnet_hdr_len;
+    uint8_t *data = pkt->data;
     uint16_t l3_proto;
     ssize_t l2hdr_len;
 
-    if (data == NULL) {
-        trace_colo_proxy_main_vnet_info("This packet is not parsed correctly,

"

net/colo.c int parse_packet_early(Packet *pkt) · line 55

Quoted 5 lines
net/colo.c +5 -0
+    assert(data);
+
+    /* Check the received vnet_hdr_len then add the offset */
+    if (pkt->size < sizeof(struct eth_header) + sizeof(struct vlan_header)
+        + pkt->vnet_hdr_len) {
Quoted 5 lines

I think this expression needs more care to avoid overflow with a maliciously over-large vnet_hdr_len value.

Casting pkt->vnet_hdr_len to int64_t would be one way to do that; there may be better approaches.

Yes, you are right. And I found better to use this check to avoid overflow:
"pkt->vnet_hdr_len < sizeof(struct virtio_net_hdr)"
I will fix it in next version.

Thanks
Chen

Quoted 3 lines

thanks
-- PMM