OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

colo-proxy: fix memory leak

Browse Source 
Fix memory leak in colo-compare.c and filter-rewriter.c
Report by Coverity and add some comments.

Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com>
Reviewed-by: zhanghailiang <zhang.zhanghailiang@huawei.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
This commit is contained in:
Zhang Chen 2016-10-17 17:23:59 +08:00 committed by Jason Wang
parent c7c3591669
commit 2061c14c9b
3 changed files with 20 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
net/colo-compare.c
View File

@ -188,7 +188,6 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
{ {
struct tcphdr *ptcp, *stcp; struct tcphdr *ptcp, *stcp;
int res; int res;
char *sdebug, *ddebug;
trace_colo_compare_main("compare tcp"); trace_colo_compare_main("compare tcp");
if (ppkt->size != spkt->size) { if (ppkt->size != spkt->size) {
@ -219,24 +218,21 @@ static int colo_packet_compare_tcp(Packet *spkt, Packet *ppkt)
(spkt->size - ETH_HLEN)); (spkt->size - ETH_HLEN));
if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { if (res != 0 && trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) {
sdebug = strdup(inet_ntoa(ppkt->ip->ip_src)); trace_colo_compare_pkt_info(inet_ntoa(ppkt->ip->ip_src),
ddebug = strdup(inet_ntoa(ppkt->ip->ip_dst)); inet_ntoa(ppkt->ip->ip_dst),
fprintf(stderr, "%s: src/dst: %s/%s p: seq/ack=%u/%u" ntohl(ptcp->th_seq),
" s: seq/ack=%u/%u res=%d flags=%x/%x\n", ntohl(ptcp->th_ack),
__func__, sdebug, ddebug, ntohl(stcp->th_seq),
(unsigned int)ntohl(ptcp->th_seq), ntohl(stcp->th_ack),
(unsigned int)ntohl(ptcp->th_ack), res, ptcp->th_flags,
(unsigned int)ntohl(stcp->th_seq), stcp->th_flags,
(unsigned int)ntohl(stcp->th_ack), ppkt->size,
res, ptcp->th_flags, stcp->th_flags); spkt->size);
fprintf(stderr, "Primary len = %d\n", ppkt->size); qemu_hexdump((char *)ppkt->data, stderr,
qemu_hexdump((char *)ppkt->data, stderr, "colo-compare", ppkt->size); "colo-compare ppkt", ppkt->size);
fprintf(stderr, "Secondary len = %d\n", spkt->size); qemu_hexdump((char *)spkt->data, stderr,
qemu_hexdump((char *)spkt->data, stderr, "colo-compare", spkt->size); "colo-compare spkt", spkt->size);
g_free(sdebug);
g_free(ddebug);
} }
return res; return res;

17
net/filter-rewriter.c
View File

@ -68,15 +68,11 @@ static int handle_primary_tcp_pkt(NetFilterState *nf,
tcp_pkt = (struct tcphdr *)pkt->transport_header; tcp_pkt = (struct tcphdr *)pkt->transport_header;
if (trace_event_get_state(TRACE_COLO_FILTER_REWRITER_DEBUG)) { if (trace_event_get_state(TRACE_COLO_FILTER_REWRITER_DEBUG)) {
char *sdebug, *ddebug; trace_colo_filter_rewriter_pkt_info(__func__,
sdebug = strdup(inet_ntoa(pkt->ip->ip_src)); inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst),
ddebug = strdup(inet_ntoa(pkt->ip->ip_dst));
trace_colo_filter_rewriter_pkt_info(__func__, sdebug, ddebug,
ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack),
tcp_pkt->th_flags); tcp_pkt->th_flags);
trace_colo_filter_rewriter_conn_offset(conn->offset); trace_colo_filter_rewriter_conn_offset(conn->offset);
g_free(sdebug);
g_free(ddebug);
} }
if (((tcp_pkt->th_flags & (TH_ACK | TH_SYN)) == TH_SYN)) { if (((tcp_pkt->th_flags & (TH_ACK | TH_SYN)) == TH_SYN)) {
@ -116,15 +112,11 @@ static int handle_secondary_tcp_pkt(NetFilterState *nf,
tcp_pkt = (struct tcphdr *)pkt->transport_header; tcp_pkt = (struct tcphdr *)pkt->transport_header;
if (trace_event_get_state(TRACE_COLO_FILTER_REWRITER_DEBUG)) { if (trace_event_get_state(TRACE_COLO_FILTER_REWRITER_DEBUG)) {
char *sdebug, *ddebug; trace_colo_filter_rewriter_pkt_info(__func__,
sdebug = strdup(inet_ntoa(pkt->ip->ip_src)); inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst),
ddebug = strdup(inet_ntoa(pkt->ip->ip_dst));
trace_colo_filter_rewriter_pkt_info(__func__, sdebug, ddebug,
ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack),
tcp_pkt->th_flags); tcp_pkt->th_flags);
trace_colo_filter_rewriter_conn_offset(conn->offset); trace_colo_filter_rewriter_conn_offset(conn->offset);
g_free(sdebug);
g_free(ddebug);
} }
if (((tcp_pkt->th_flags & (TH_ACK | TH_SYN)) == (TH_ACK | TH_SYN))) { if (((tcp_pkt->th_flags & (TH_ACK | TH_SYN)) == (TH_ACK | TH_SYN))) {
@ -162,6 +154,7 @@ static ssize_t colo_rewriter_receive_iov(NetFilterState *nf,
iov_to_buf(iov, iovcnt, 0, buf, size); iov_to_buf(iov, iovcnt, 0, buf, size);
pkt = packet_new(buf, size); pkt = packet_new(buf, size);
g_free(buf);
/* /*
* if we get tcp packet * if we get tcp packet

1
net/trace-events
View File

@ -13,6 +13,7 @@ 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"
colo_old_packet_check_found(int64_t old_time) "%" PRId64 colo_old_packet_check_found(int64_t old_time) "%" PRId64
colo_compare_miscompare(void) "" colo_compare_miscompare(void) ""
colo_compare_pkt_info(const char *src, const char *dst, uint32_t pseq, uint32_t pack, uint32_t sseq, uint32_t sack, int res, uint32_t pflag, uint32_t sflag, int psize, int ssize) "src/dst: %s/%s p: seq/ack=%u/%u s: seq/ack=%u/%u res=%d flags=%x/%x ppkt_size: %d spkt_size: %d\n"
# net/filter-rewriter.c # net/filter-rewriter.c
colo_filter_rewriter_debug(void) "" colo_filter_rewriter_debug(void) ""