From patchwork Fri Apr 14 06:27:15 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhang Chen X-Patchwork-Id: 750740 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w475P1QXdz9sNZ for ; Fri, 14 Apr 2017 16:28:25 +1000 (AEST) Received: from localhost ([::1]:52018 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyuiU-0002Ih-Ls for incoming@patchwork.ozlabs.org; Fri, 14 Apr 2017 02:28:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyui8-0002Ic-7q for qemu-devel@nongnu.org; Fri, 14 Apr 2017 02:28:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cyui3-0006uC-MP for qemu-devel@nongnu.org; Fri, 14 Apr 2017 02:28:00 -0400 Received: from [59.151.112.132] (port=57362 helo=heian.cn.fujitsu.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cyui3-0006rH-8p for qemu-devel@nongnu.org; Fri, 14 Apr 2017 02:27:55 -0400 X-IronPort-AV: E=Sophos;i="5.22,518,1449504000"; d="scan'208";a="17740711" Received: from unknown (HELO cn.fujitsu.com) ([10.167.33.5]) by heian.cn.fujitsu.com with ESMTP; 14 Apr 2017 14:27:46 +0800 Received: from G08CNEXCHPEKD01.g08.fujitsu.local (unknown [10.167.33.80]) by cn.fujitsu.com (Postfix) with ESMTP id 42B8847CE221; Fri, 14 Apr 2017 14:27:48 +0800 (CST) Received: from localhost.localdomain (10.167.226.56) by G08CNEXCHPEKD01.g08.fujitsu.local (10.167.33.89) with Microsoft SMTP Server (TLS) id 14.3.319.2; Fri, 14 Apr 2017 14:27:46 +0800 From: Zhang Chen To: qemu devel , Jason Wang Date: Fri, 14 Apr 2017 14:27:15 +0800 Message-ID: <1492151235-16173-1-git-send-email-zhangchen.fnst@cn.fujitsu.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [10.167.226.56] X-yoursite-MailScanner-ID: 42B8847CE221.AB642 X-yoursite-MailScanner: Found to be clean X-yoursite-MailScanner-From: zhangchen.fnst@cn.fujitsu.com X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 59.151.112.132 Subject: [Qemu-devel] [PATCH] net/filter-rewriter.c: Fix trace_event print bug X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Because of inet_ntoa() return a statically allocated buffer, subsequent calls will overwrite, So we fix this bug. Signed-off-by: Zhang Chen --- net/filter-rewriter.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/net/filter-rewriter.c b/net/filter-rewriter.c index 91cf6b2..aad00b4 100644 --- a/net/filter-rewriter.c +++ b/net/filter-rewriter.c @@ -69,8 +69,13 @@ static int handle_primary_tcp_pkt(RewriterState *rf, tcp_pkt = (struct tcphdr *)pkt->transport_header; if (trace_event_get_state(TRACE_COLO_FILTER_REWRITER_DEBUG)) { + char ip_src[20], ip_dst[20]; + + strcpy(ip_src, inet_ntoa(pkt->ip->ip_src)); + strcpy(ip_dst, inet_ntoa(pkt->ip->ip_dst)); + trace_colo_filter_rewriter_pkt_info(__func__, - inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), + ip_src, ip_dst, ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), tcp_pkt->th_flags); trace_colo_filter_rewriter_conn_offset(conn->offset); @@ -144,8 +149,13 @@ static int handle_secondary_tcp_pkt(RewriterState *rf, tcp_pkt = (struct tcphdr *)pkt->transport_header; if (trace_event_get_state(TRACE_COLO_FILTER_REWRITER_DEBUG)) { + char ip_src[20], ip_dst[20]; + + strcpy(ip_src, inet_ntoa(pkt->ip->ip_src)); + strcpy(ip_dst, inet_ntoa(pkt->ip->ip_dst)); + trace_colo_filter_rewriter_pkt_info(__func__, - inet_ntoa(pkt->ip->ip_src), inet_ntoa(pkt->ip->ip_dst), + ip_src, ip_dst, ntohl(tcp_pkt->th_seq), ntohl(tcp_pkt->th_ack), tcp_pkt->th_flags); trace_colo_filter_rewriter_conn_offset(conn->offset);