[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL V2 25/25] net/colo.c: fix segmentation fault when packet is not pa
From: |
Jason Wang |
Subject: |
[PULL V2 25/25] net/colo.c: fix segmentation fault when packet is not parsed correctly |
Date: |
Wed, 20 Jul 2022 17:03:13 +0800 |
From: Zhang Chen <chen.zhang@intel.com>
When COLO use only one vnet_hdr_support parameter between
filter-redirector and filter-mirror(or colo-compare), COLO will crash
with segmentation fault. Back track as follow:
Thread 1 "qemu-system-x86" received signal SIGSEGV, Segmentation fault.
0x0000555555cb200b in eth_get_l2_hdr_length (p=0x0)
at /home/tao/project/COLO/colo-qemu/include/net/eth.h:296
296 uint16_t proto = be16_to_cpu(PKT_GET_ETH_HDR(p)->h_proto);
(gdb) bt
0 0x0000555555cb200b in eth_get_l2_hdr_length (p=0x0)
at /home/tao/project/COLO/colo-qemu/include/net/eth.h:296
1 0x0000555555cb22b4 in parse_packet_early (pkt=0x555556a44840) at
net/colo.c:49
2 0x0000555555cb2b91 in is_tcp_packet (pkt=0x555556a44840) at
net/filter-rewriter.c:63
So wrong vnet_hdr_len will cause pkt->data become NULL. Add check to
raise error and add trace-events to track vnet_hdr_len.
Signed-off-by: Tao Xu <tao3.xu@intel.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Li Zhijian <lizhijian@fujitsu.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
net/colo.c | 9 ++++++++-
net/trace-events | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/net/colo.c b/net/colo.c
index 694f3c9..6b0ff56 100644
--- a/net/colo.c
+++ b/net/colo.c
@@ -46,7 +46,14 @@ int parse_packet_early(Packet *pkt)
static const uint8_t vlan[] = {0x81, 0x00};
uint8_t *data = pkt->data + pkt->vnet_hdr_len;
uint16_t l3_proto;
- ssize_t l2hdr_len = eth_get_l2_hdr_length(data);
+ ssize_t l2hdr_len;
+
+ if (data == NULL) {
+ trace_colo_proxy_main_vnet_info("This packet is not parsed correctly, "
+ "pkt->vnet_hdr_len",
pkt->vnet_hdr_len);
+ return 1;
+ }
+ l2hdr_len = eth_get_l2_hdr_length(data);
if (pkt->size < ETH_HLEN + pkt->vnet_hdr_len) {
trace_colo_proxy_main("pkt->size < ETH_HLEN");
diff --git a/net/trace-events b/net/trace-events
index d7a1725..6af927b 100644
--- a/net/trace-events
+++ b/net/trace-events
@@ -9,6 +9,7 @@ vhost_user_event(const char *chr, int event) "chr: %s got
event: %d"
# colo.c
colo_proxy_main(const char *chr) ": %s"
+colo_proxy_main_vnet_info(const char *sta, int size) ": %s = %d"
# colo-compare.c
colo_compare_main(const char *chr) ": %s"
--
2.7.4
- [PULL V2 22/25] softmmu/runstate.c: add RunStateTransition support form COLO to PRELAUNCH, (continued)
- [PULL V2 22/25] softmmu/runstate.c: add RunStateTransition support form COLO to PRELAUNCH, Jason Wang, 2022/07/20
- [PULL V2 12/25] vhost: Expose vhost_svq_add, Jason Wang, 2022/07/20
- [PULL V2 14/25] vhost: Add svq avail_handler callback, Jason Wang, 2022/07/20
- [PULL V2 13/25] vhost: add vhost_svq_poll, Jason Wang, 2022/07/20
- [PULL V2 16/25] vhost-net-vdpa: add stubs for when no virtio-net device is present, Jason Wang, 2022/07/20
- [PULL V2 18/25] vdpa: Buffer CVQ support on shadow virtqueue, Jason Wang, 2022/07/20
- [PULL V2 20/25] vdpa: Add device migration blocker, Jason Wang, 2022/07/20
- [PULL V2 21/25] vdpa: Add x-svq to NetdevVhostVDPAOptions, Jason Wang, 2022/07/20
- [PULL V2 23/25] net/colo: Fix a "double free" crash to clear the conn_list, Jason Wang, 2022/07/20
- [PULL V2 24/25] net/colo.c: No need to track conn_list for filter-rewriter, Jason Wang, 2022/07/20
- [PULL V2 25/25] net/colo.c: fix segmentation fault when packet is not parsed correctly,
Jason Wang <=
- Re: [PULL V2 00/25] Net patches, Peter Maydell, 2022/07/20