haraldwolff/qemu-patch-raspberry4
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

colo-compare: Fix memory leak in packet_enqueue()

Browse source 
The patch is to fix the "pkt" memory leak in packet_enqueue().
The allocated "pkt" needs to be freed if the colo compare
primary or secondary queue is too big.

Replace the error_report of full queue with a trace event.

Signed-off-by: Derek Su <dereksu@qnap.com>
Reviewed-by: Zhang Chen <chen.zhang@intel.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Zhang Chen <chen.zhang@intel.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Derek Su 2020-05-22 15:53:57 +08:00 committed by Jason Wang
parent 5bd57eba04
commit bdadbb0f74
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
net/colo-compare.c
View file

@ -146,6 +146,10 @@ enum {
SECONDARY_IN, SECONDARY_IN,
}; };
static const char *colo_mode[] = {
[PRIMARY_IN] = "primary",
[SECONDARY_IN] = "secondary",
};
static int compare_chr_send(CompareState *s, static int compare_chr_send(CompareState *s,
uint8_t *buf, uint8_t *buf,
@ -242,6 +246,7 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
ConnectionKey key; ConnectionKey key;
Packet *pkt = NULL; Packet *pkt = NULL;
Connection *conn; Connection *conn;
int ret;
if (mode == PRIMARY_IN) { if (mode == PRIMARY_IN) {
pkt = packet_new(s->pri_rs.buf, pkt = packet_new(s->pri_rs.buf,
@ -270,16 +275,18 @@ static int packet_enqueue(CompareState *s, int mode, Connection **con)
} }
if (mode == PRIMARY_IN) { if (mode == PRIMARY_IN) {
if (!colo_insert_packet(&conn->primary_list, pkt, &conn->pack)) { ret = colo_insert_packet(&conn->primary_list, pkt, &conn->pack);
error_report("colo compare primary queue size too big,"
"drop packet");
}
} else { } else {
if (!colo_insert_packet(&conn->secondary_list, pkt, &conn->sack)) { ret = colo_insert_packet(&conn->secondary_list, pkt, &conn->sack);
error_report("colo compare secondary queue size too big,"
"drop packet");
}
} }
if (!ret) {
trace_colo_compare_drop_packet(colo_mode[mode],
"queue size too big, drop packet");
packet_destroy(pkt, NULL);
pkt = NULL;
}
*con = conn; *con = conn;
return 0; return 0;

1
net/trace-events
View file

@ -12,6 +12,7 @@ colo_proxy_main(const char *chr) ": %s"
# colo-compare.c # colo-compare.c
colo_compare_main(const char *chr) ": %s" colo_compare_main(const char *chr) ": %s"
colo_compare_drop_packet(const char *queue, const char *chr) ": %s: %s"
colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d" colo_compare_udp_miscompare(const char *sta, int size) ": %s = %d"
colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d" colo_compare_icmp_miscompare(const char *sta, int size) ": %s = %d"
colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s" colo_compare_ip_info(int psize, const char *sta, const char *stb, int ssize, const char *stc, const char *std) "ppkt size = %d, ip_src = %s, ip_dst = %s, spkt size = %d, ip_src = %s, ip_dst = %s"