| Message ID | 1489045207-27706-1-git-send-email-zhangchen.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 2017年03月09日 15:40, Zhang Chen wrote: > Because of inet_ntoa() return a statically allocated buffer, > subsequent calls will overwrite, So we fix this bug. > > Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> > --- > net/colo-compare.c | 33 +++++++++++++++++++++++++-------- > 1 file changed, 25 insertions(+), 8 deletions(-) > > diff --git a/net/colo-compare.c b/net/colo-compare.c > index 282727b..54e6d40 100644 > --- a/net/colo-compare.c > +++ b/net/colo-compare.c > @@ -182,10 +182,18 @@ static int packet_enqueue(CompareState *s, int mode) > */ > static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset) > { > - trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), > - inet_ntoa(ppkt->ip->ip_dst), spkt->size, > - inet_ntoa(spkt->ip->ip_src), > - inet_ntoa(spkt->ip->ip_dst)); > + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { > + char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20]; > + > + strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); > + strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); > + strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); > + strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); > + > + trace_colo_compare_ip_info(ppkt->size, pri_ip_src, > + pri_ip_dst, spkt->size, > + sec_ip_src, sec_ip_dst); > + } > > if (ppkt->size == spkt->size) { > return memcmp(ppkt->data + offset, spkt->data + offset, > @@ -336,10 +344,19 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) > static int colo_packet_compare_other(Packet *spkt, Packet *ppkt) > { > trace_colo_compare_main("compare other"); > - trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), > - inet_ntoa(ppkt->ip->ip_dst), spkt->size, > - inet_ntoa(spkt->ip->ip_src), > - inet_ntoa(spkt->ip->ip_dst)); > + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { > + char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20]; > + > + strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); > + strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); > + strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); > + strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); > + > + trace_colo_compare_ip_info(ppkt->size, pri_ip_src, > + pri_ip_dst, spkt->size, > + sec_ip_src, sec_ip_dst); > + } > + > return colo_packet_compare_common(ppkt, spkt, 0); > } > Applied, thanks.
diff --git a/net/colo-compare.c b/net/colo-compare.c index 282727b..54e6d40 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -182,10 +182,18 @@ static int packet_enqueue(CompareState *s, int mode) */ static int colo_packet_compare_common(Packet *ppkt, Packet *spkt, int offset) { - trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), - inet_ntoa(ppkt->ip->ip_dst), spkt->size, - inet_ntoa(spkt->ip->ip_src), - inet_ntoa(spkt->ip->ip_dst)); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20]; + + strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); + strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); + strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); + strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); + + trace_colo_compare_ip_info(ppkt->size, pri_ip_src, + pri_ip_dst, spkt->size, + sec_ip_src, sec_ip_dst); + } if (ppkt->size == spkt->size) { return memcmp(ppkt->data + offset, spkt->data + offset, @@ -336,10 +344,19 @@ static int colo_packet_compare_icmp(Packet *spkt, Packet *ppkt) static int colo_packet_compare_other(Packet *spkt, Packet *ppkt) { trace_colo_compare_main("compare other"); - trace_colo_compare_ip_info(ppkt->size, inet_ntoa(ppkt->ip->ip_src), - inet_ntoa(ppkt->ip->ip_dst), spkt->size, - inet_ntoa(spkt->ip->ip_src), - inet_ntoa(spkt->ip->ip_dst)); + if (trace_event_get_state(TRACE_COLO_COMPARE_MISCOMPARE)) { + char pri_ip_src[20], pri_ip_dst[20], sec_ip_src[20], sec_ip_dst[20]; + + strcpy(pri_ip_src, inet_ntoa(ppkt->ip->ip_src)); + strcpy(pri_ip_dst, inet_ntoa(ppkt->ip->ip_dst)); + strcpy(sec_ip_src, inet_ntoa(spkt->ip->ip_src)); + strcpy(sec_ip_dst, inet_ntoa(spkt->ip->ip_dst)); + + trace_colo_compare_ip_info(ppkt->size, pri_ip_src, + pri_ip_dst, spkt->size, + sec_ip_src, sec_ip_dst); + } + return colo_packet_compare_common(ppkt, spkt, 0); }
Because of inet_ntoa() return a statically allocated buffer, subsequent calls will overwrite, So we fix this bug. Signed-off-by: Zhang Chen <zhangchen.fnst@cn.fujitsu.com> --- net/colo-compare.c | 33 +++++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-)