From nobody Wed Apr 16 12:21:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564389290; cv=none; d=zoho.com; s=zohoarc; b=EnWDGecFHpRCy0DCFeJNSrB71wAK90KLWozRhWXprIqNDwoBj0eivqF8dzuqfaTx1+S/JINGsjlYDdJDtO6l2ohDohMs0CqDtNzsi59dWJVskDCarG71vpaoZTwpQDXPgqoYqyBHbCjvoSgXu3bpsvQbpqA0TBagLlUMfO9b9rk= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389290; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=qwE/PkDggxDh6tBvUGi68c2h6fKNNtu2DBNRJvCXG/o=; b=QV+tE8E8CS9Ksv51z3eIoCp8q3Z8lVgAT8CkWTVVwra1J09X+uRPD+nqDX6J+dLH22DcYBgWh54v5Iao8hEwg9qBmyWU6WDA8ptXpZ2w1Pwy/Wojeq1jZPyafHLiKhqMXWpnyRFvnHbdmbzB2WEts5h8qnIoBe1nu+BPp/xEklg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564389290366307.4134905155604; Mon, 29 Jul 2019 01:34:50 -0700 (PDT) Received: from localhost ([::1]:50468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs17J-0005ce-Bh for importer@patchew.org; Mon, 29 Jul 2019 04:34:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48005) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16P-0004QO-Fc for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16O-0003E6-GL for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38618) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16O-0003Dh-BL for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:52 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A0D68A3B46; Mon, 29 Jul 2019 08:33:51 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 45CC710190AA; Mon, 29 Jul 2019 08:33:50 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:42 +0800 Message-Id: <1564389226-4489-2-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Mon, 29 Jul 2019 08:33:51 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 1/5] e1000: don't raise interrupt in pre_save() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" We should not raise any interrupt after VM has been stopped but this is what e1000 currently did when mit timer is active in pre_save(). Fixing this by scheduling a timer in post_load() which can make sure the interrupt was raised when VM is running. Reported-and-tested-by: Longpeng Signed-off-by: Jason Wang --- hw/net/e1000.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/hw/net/e1000.c b/hw/net/e1000.c index 1dc1466..a023ceb 100644 --- a/hw/net/e1000.c +++ b/hw/net/e1000.c @@ -1381,11 +1381,6 @@ static int e1000_pre_save(void *opaque) E1000State *s =3D opaque; NetClientState *nc =3D qemu_get_queue(s->nic); =20 - /* If the mitigation timer is active, emulate a timeout now. */ - if (s->mit_timer_on) { - e1000_mit_timer(s); - } - /* * If link is down and auto-negotiation is supported and ongoing, * complete auto-negotiation immediately. This allows us to look @@ -1423,7 +1418,8 @@ static int e1000_post_load(void *opaque, int version_= id) s->mit_irq_level =3D false; } s->mit_ide =3D 0; - s->mit_timer_on =3D false; + s->mit_timer_on =3D true; + timer_mod(s->mit_timer, qemu_clock_get_ns(QEMU_CLOCK_VIRTUAL) + 1); =20 /* nc.link_down can't be migrated, so infer link_down according * to link status bit in mac_reg[STATUS]. --=20 2.5.0 From nobody Wed Apr 16 12:21:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564389358; cv=none; d=zoho.com; s=zohoarc; b=ehWFWvBEYkQlg93kp23NlFklxDGAaFVjsF+52ayJIz5MJAUdxp+XrWS2afWpZJLHwRD7fJYVsWwoVXDROzDnLIlkEnHG84wf88b0WklBzz5JhNGhjwnkhyMc5QvvSvdcce9BQ4IPQs37K2uQNmwFZJ+p62czDxtnWb5EriiL9rA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389358; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=quV7OiJJh1dK1Jx+UWu6D7YnVtnBK64JP5KUCRRcdwM=; b=lNsllAeEUtynJlyQ3Meoc39N9GyQgSKOsxmvCj8RL8ylGPwtnFKe2Ncc9fWbx3L6ZEJUddb3uSrMFDpRzazwA8Nt2w9JwNst/hd2zeUyQzluYnohiSucvgqv82ZAuEEmZptONRg0LRco25OmGRnAZd/l8GS9Z8fquJig46NYbp4= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564389358808984.4058802951845; Mon, 29 Jul 2019 01:35:58 -0700 (PDT) Received: from localhost ([::1]:50480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs18P-0007UW-Ta for importer@patchew.org; Mon, 29 Jul 2019 04:35:57 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48023) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16T-0004Sc-7d for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:59 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16Q-0003F8-SU for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:56 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43470) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16Q-0003Ek-LR for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:54 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E1E7F308FC5F; Mon, 29 Jul 2019 08:33:53 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2B5D410190AA; Mon, 29 Jul 2019 08:33:51 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:43 +0800 Message-Id: <1564389226-4489-3-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Mon, 29 Jul 2019 08:33:53 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 2/5] qemu-bridge-helper: restrict interface name to IFNAMSIZ X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit The network interface name in Linux is defined to be of size IFNAMSIZ(=3D16), including the terminating null('\0') byte. The same is applied to interface names read from 'bridge.conf' file to form ACL rules. If user supplied '--br=3Dbridge' name is not restricted to the same length, it could lead to ACL bypass issue. Restrict interface name to IFNAMSIZ, including null byte. Reported-by: Riccardo Schirone Signed-off-by: Prasad J Pandit Reviewed-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang Signed-off-by: Jason Wang --- qemu-bridge-helper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 95624bc..2058e10 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -119,6 +119,13 @@ static int parse_acl_file(const char *filename, ACLLis= t *acl_list) } *argend =3D 0; =20 + if (!g_str_equal(cmd, "include") && strlen(arg) >=3D IFNAMSIZ) { + fprintf(stderr, "name `%s' too long: %zu\n", arg, strlen(arg)); + fclose(f); + errno =3D EINVAL; + return -1; + } + if (strcmp(cmd, "deny") =3D=3D 0) { acl_rule =3D g_malloc(sizeof(*acl_rule)); if (strcmp(arg, "all") =3D=3D 0) { @@ -269,6 +276,10 @@ int main(int argc, char **argv) usage(); return EXIT_FAILURE; } + if (strlen(bridge) >=3D IFNAMSIZ) { + fprintf(stderr, "name `%s' too long: %zu\n", bridge, strlen(bridge= )); + return EXIT_FAILURE; + } =20 /* parse default acl file */ QSIMPLEQ_INIT(&acl_list); --=20 2.5.0 From nobody Wed Apr 16 12:21:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564389396; cv=none; d=zoho.com; s=zohoarc; b=ivCq/atbRJfc691NrsEAhdnfo4u9vReXvd/H8PtOmSEVkg7CBZTt1xasAqbLmAiVMzpGVX7kElbh2PhJLOW+v5Ejm2kO81OKWhnvv2MTwB6bbQOUp83vhi3Oz/ts15UvIOzPD7xYP8axSlhJ3qhtiVfAP03hnaxPQkUiis6CZEc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389396; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=Tpw5UDr+1KV1Np94dxpKbqF1cgc+u43HV2IF9d87AHE=; b=ZAYNLzQ0nNgBia6p1UGd1aJxofB6Ed7wTIBgxf0oDjLeKxwlBaaFMDhW/IHIBUVEKTr1sKo+jFqol0w87LhCZ3//IHAGtWYTBwvHq54TPNoUmpVCKlYWS8BqwzUr7Cob6h4WAGE6OQ9U1662nW9uM9vAVsPtIgFWyGfjOvKOd3o= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564389396250367.0823571305432; Mon, 29 Jul 2019 01:36:36 -0700 (PDT) Received: from localhost ([::1]:50486 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs191-0008NJ-Ah for importer@patchew.org; Mon, 29 Jul 2019 04:36:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48035) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16U-0004Ts-DQ for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16T-0003HQ-GW for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:33374) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16T-0003Ft-An for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:33:57 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3B5B883F4C; Mon, 29 Jul 2019 08:33:56 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id 6BFBE10190AA; Mon, 29 Jul 2019 08:33:54 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:44 +0800 Message-Id: <1564389226-4489-4-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.27]); Mon, 29 Jul 2019 08:33:56 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 3/5] qemu-bridge-helper: move repeating code in parse_acl_file X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit Move repeating error handling sequence in parse_acl_file routine to an 'err' label. Signed-off-by: Prasad J Pandit Reviewed-by: Stefan Hajnoczi Reviewed-by: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang Signed-off-by: Jason Wang --- qemu-bridge-helper.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 2058e10..3d50ec0 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -102,9 +102,7 @@ static int parse_acl_file(const char *filename, ACLList= *acl_list) =20 if (arg =3D=3D NULL) { fprintf(stderr, "Invalid config line:\n %s\n", line); - fclose(f); - errno =3D EINVAL; - return -1; + goto err; } =20 *arg =3D 0; @@ -121,9 +119,7 @@ static int parse_acl_file(const char *filename, ACLList= *acl_list) =20 if (!g_str_equal(cmd, "include") && strlen(arg) >=3D IFNAMSIZ) { fprintf(stderr, "name `%s' too long: %zu\n", arg, strlen(arg)); - fclose(f); - errno =3D EINVAL; - return -1; + goto err; } =20 if (strcmp(cmd, "deny") =3D=3D 0) { @@ -149,15 +145,18 @@ static int parse_acl_file(const char *filename, ACLLi= st *acl_list) parse_acl_file(arg, acl_list); } else { fprintf(stderr, "Unknown command `%s'\n", cmd); - fclose(f); - errno =3D EINVAL; - return -1; + goto err; } } =20 fclose(f); - return 0; + +err: + fclose(f); + errno =3D EINVAL; + return -1; + } =20 static bool has_vnet_hdr(int fd) --=20 2.5.0 From nobody Wed Apr 16 12:21:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564389469; cv=none; d=zoho.com; s=zohoarc; b=N64B9k/crHCXPDCHZz9Zp7wVFrB7NNtj6HlPBXTxIFFyWIYIS9LnilZxs01P7hUta9SnfjHAyUNhkgrdfgxWW7BfEUyYjnvfsIrpBgcw1u9yI0hUJ4GI6nxoFkTR16+JJuqpQeBUjviIOHKUFT8Kjw17McLQ19kopq9y3vRqmOI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389469; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=jBISo/BiM+0pFyO750ytvDjamsxWUGqWcTTuhz4RAjo=; b=CHo1souqW/KWRCk7kybOW88E5eEVzWoRWlrzZN43N3yQhLWDz61E317D1yhmKqGthMHJ6S+476baibz77U4VbKNpyU7WSKotGDC5au4Fr2dqmVKrE6EuDlu5gqwEn1br1MWgmEhn+3ddwHHMl5DBng3dcsOrrTLx62+pZF8USps= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564389469673522.0802004214013; Mon, 29 Jul 2019 01:37:49 -0700 (PDT) Received: from localhost ([::1]:50498 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs1A7-00017j-F2 for importer@patchew.org; Mon, 29 Jul 2019 04:37:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48056) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16Z-0004VL-9C for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16X-0003Ik-73 for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:03 -0400 Received: from mx1.redhat.com ([209.132.183.28]:45566) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16V-0003Hy-5f for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:00 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 617BC3082133; Mon, 29 Jul 2019 08:33:58 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id B790410190AA; Mon, 29 Jul 2019 08:33:56 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:45 +0800 Message-Id: <1564389226-4489-5-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 29 Jul 2019 08:33:58 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/5] net: tap: replace snprintf with g_strdup_printf calls X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jason Wang , Prasad J Pandit Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" From: Prasad J Pandit When invoking qemu-bridge-helper in 'net_bridge_run_helper', instead of using fixed sized buffers, use dynamically allocated ones initialised and returned by g_strdup_printf(). Signed-off-by: Prasad J Pandit Reviewed-by: Li Qiang Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Jason Wang --- net/tap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/net/tap.c b/net/tap.c index e8aadd8..fc38029 100644 --- a/net/tap.c +++ b/net/tap.c @@ -498,9 +498,9 @@ static int net_bridge_run_helper(const char *helper, co= nst char *bridge, } if (pid =3D=3D 0) { int open_max =3D sysconf(_SC_OPEN_MAX), i; - char fd_buf[6+10]; - char br_buf[6+IFNAMSIZ] =3D {0}; - char helper_cmd[PATH_MAX + sizeof(fd_buf) + sizeof(br_buf) + 15]; + char *fd_buf =3D NULL; + char *br_buf =3D NULL; + char *helper_cmd =3D NULL; =20 for (i =3D 3; i < open_max; i++) { if (i !=3D sv[1]) { @@ -508,17 +508,17 @@ static int net_bridge_run_helper(const char *helper, = const char *bridge, } } =20 - snprintf(fd_buf, sizeof(fd_buf), "%s%d", "--fd=3D", sv[1]); + fd_buf =3D g_strdup_printf("%s%d", "--fd=3D", sv[1]); =20 if (strrchr(helper, ' ') || strrchr(helper, '\t')) { /* assume helper is a command */ =20 if (strstr(helper, "--br=3D") =3D=3D NULL) { - snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=3D", bridge= ); + br_buf =3D g_strdup_printf("%s%s", "--br=3D", bridge); } =20 - snprintf(helper_cmd, sizeof(helper_cmd), "%s %s %s %s", - helper, "--use-vnet", fd_buf, br_buf); + helper_cmd =3D g_strdup_printf("%s %s %s %s", helper, + "--use-vnet", fd_buf, br_buf ? br_buf : ""); =20 parg =3D args; *parg++ =3D (char *)"sh"; @@ -527,10 +527,11 @@ static int net_bridge_run_helper(const char *helper, = const char *bridge, *parg++ =3D NULL; =20 execv("/bin/sh", args); + g_free(helper_cmd); } else { /* assume helper is just the executable path name */ =20 - snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=3D", bridge); + br_buf =3D g_strdup_printf("%s%s", "--br=3D", bridge); =20 parg =3D args; *parg++ =3D (char *)helper; @@ -541,6 +542,8 @@ static int net_bridge_run_helper(const char *helper, co= nst char *bridge, =20 execv(helper, args); } + g_free(fd_buf); + g_free(br_buf); _exit(1); =20 } else { --=20 2.5.0 From nobody Wed Apr 16 12:21:32 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1564389293; cv=none; d=zoho.com; s=zohoarc; b=YMfWm8fTItVaF6J6OKAen9hucduJTCfOmSbDCf1tEbxyUFwyVw7EfBpRvDyv0e9tz8IOPRZDRx5UoDz2aTNdd3KFMrQ20OMR2skwjbdrnsjHMRya6LVM9hb2JylLp/uj/djoKV3ihsPPlHXg/CAQMdNXEb/XoZkqcW3bS09BYSI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564389293; h=Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=oS5GVC0RIylSkvcG6h66LQZdxLdAZnP3+6L2mQqlRiY=; b=X8evvO/B+mZFSaQYHnfPsMRfSkboF1SU/7lCnW5sMLXFCzElB1ueMPsKUY9XvVr4IFGl2QbO9sYlBot/etJRkTepOyvRLYTy2jrTeIOewEDybHt4eonl7J9P2RPR0N+DlTUMZ0qgqDARVCMexIZJBpa6BAYSb9/fX+dvynE+od8= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1564389293157174.61808604427938; Mon, 29 Jul 2019 01:34:53 -0700 (PDT) Received: from localhost ([::1]:50470 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs17M-0005kl-6k for importer@patchew.org; Mon, 29 Jul 2019 04:34:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48074) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hs16b-0004X6-71 for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:08 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hs16Z-0003Jp-7U for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:05 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38966) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hs16X-0003IZ-8T for qemu-devel@nongnu.org; Mon, 29 Jul 2019 04:34:02 -0400 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8B0E7C01DE0D; Mon, 29 Jul 2019 08:34:00 +0000 (UTC) Received: from jason-ThinkPad-T430s.redhat.com (ovpn-12-203.pek2.redhat.com [10.72.12.203]) by smtp.corp.redhat.com (Postfix) with ESMTP id DD46B10190B5; Mon, 29 Jul 2019 08:33:58 +0000 (UTC) From: Jason Wang To: qemu-devel@nongnu.org, peter.maydell@linaro.org Date: Mon, 29 Jul 2019 16:33:46 +0800 Message-Id: <1564389226-4489-6-git-send-email-jasowang@redhat.com> In-Reply-To: <1564389226-4489-1-git-send-email-jasowang@redhat.com> References: <1564389226-4489-1-git-send-email-jasowang@redhat.com> X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 29 Jul 2019 08:34:00 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 5/5] net/colo-compare.c: Fix memory leak and code style issue. X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhang Chen , Jason Wang Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Zhang Chen This patch to fix the origin "char *data" memory leak, code style issue and add necessary check here. Reported-by: Coverity (CID 1402785) Signed-off-by: Zhang Chen Reviewed-by: Peter Maydell Signed-off-by: Jason Wang --- net/colo-compare.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/net/colo-compare.c b/net/colo-compare.c index 909dd6c..7489840 100644 --- a/net/colo-compare.c +++ b/net/colo-compare.c @@ -127,6 +127,17 @@ static int compare_chr_send(CompareState *s, uint32_t vnet_hdr_len, bool notify_remote_frame); =20 +static bool packet_matches_str(const char *str, + const uint8_t *buf, + uint32_t packet_len) +{ + if (packet_len !=3D strlen(str)) { + return false; + } + + return !memcmp(str, buf, strlen(str)); +} + static void notify_remote_frame(CompareState *s) { char msg[] =3D "DO_CHECKPOINT"; @@ -1008,21 +1019,23 @@ static void compare_notify_rs_finalize(SocketReadSt= ate *notify_rs) { CompareState *s =3D container_of(notify_rs, CompareState, notify_rs); =20 - /* Get Xen colo-frame's notify and handle the message */ - char *data =3D g_memdup(notify_rs->buf, notify_rs->packet_len); - char msg[] =3D "COLO_COMPARE_GET_XEN_INIT"; + const char msg[] =3D "COLO_COMPARE_GET_XEN_INIT"; int ret; =20 - if (!strcmp(data, "COLO_USERSPACE_PROXY_INIT")) { + if (packet_matches_str("COLO_USERSPACE_PROXY_INIT", + notify_rs->buf, + notify_rs->packet_len)) { ret =3D compare_chr_send(s, (uint8_t *)msg, strlen(msg), 0, true); if (ret < 0) { error_report("Notify Xen COLO-frame INIT failed"); } - } - - if (!strcmp(data, "COLO_CHECKPOINT")) { + } else if (packet_matches_str("COLO_CHECKPOINT", + notify_rs->buf, + notify_rs->packet_len)) { /* colo-compare do checkpoint, flush pri packet and remove sec pac= ket */ g_queue_foreach(&s->conn_list, colo_flush_packets, s); + } else { + error_report("COLO compare got unsupported instruction"); } } =20 --=20 2.5.0