* [Qemu-devel] [PATCH] COLO-compare: Fix trace_event print bug
@ 2017-03-09 7:40 Zhang Chen
2017-03-13 6:07 ` Jason Wang
0 siblings, 1 reply; 2+ messages in thread
From: Zhang Chen @ 2017-03-09 7:40 UTC (permalink / raw)
To: qemu devel; +Cc: Jason Wang, Zhang Chen
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);
}
--
2.7.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [Qemu-devel] [PATCH] COLO-compare: Fix trace_event print bug
2017-03-09 7:40 [Qemu-devel] [PATCH] COLO-compare: Fix trace_event print bug Zhang Chen
@ 2017-03-13 6:07 ` Jason Wang
0 siblings, 0 replies; 2+ messages in thread
From: Jason Wang @ 2017-03-13 6:07 UTC (permalink / raw)
To: Zhang Chen, qemu devel
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.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-03-13 6:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-09 7:40 [Qemu-devel] [PATCH] COLO-compare: Fix trace_event print bug Zhang Chen
2017-03-13 6:07 ` Jason Wang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).