From nobody Fri May 10 10:45:27 2024 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=1563879036; cv=none; d=zoho.com; s=zohoarc; b=ILfkenlRMqOzPoj7079fbLCBeHCvalKiAVBIOCrCI0oT3xKDGuT0Tg+AsEWl/E6ajfHiYgcTewB3en4NF2cInZQ39GTidC4AJEUvfdGAzfMLNufB5XhSxrBc7fO+iQn0/hbVeINmfwvrxVN2PGrwWgkh9Pr9OdJK3gL0EA3JtUA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563879036; h=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=KSriEF3R0CFPIT7o+jTgKhkHEaDJ9OFsqTR0W0cRpIM=; b=P0u669zAPwdIPnug+K6rdkHZrxyQukSBfOrrgEf4WIGT4TmQaU4McwCg/f+z0jVgaMnB3NfHm0tUfwpipnJGJOYkRzKQQNChvT/PFgr67+9/T1eZa/ffDpmIWn8lK4H/41Jvf32Ww9oqvS8ItK1gzwyouB3/z3+qy8BFoem1+ms= 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 156387903649071.86924723849768; Tue, 23 Jul 2019 03:50:36 -0700 (PDT) Received: from localhost ([::1]:41198 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsNM-0007qW-7W for importer@patchew.org; Tue, 23 Jul 2019 06:50:32 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42587) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsMy-0006Qm-Q4 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsMx-0002ui-J2 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:08 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36478) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpsMx-0002uF-DY for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:07 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id BE3F430821B3; Tue, 23 Jul 2019 10:50:06 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.205.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E2F2B19C58; Tue, 23 Jul 2019 10:50:00 +0000 (UTC) From: P J P To: QEMU Developers Date: Tue, 23 Jul 2019 16:17:52 +0530 Message-Id: <20190723104754.29324-2-ppandit@redhat.com> In-Reply-To: <20190723104754.29324-1-ppandit@redhat.com> References: <20190723104754.29324-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.47]); Tue, 23 Jul 2019 10:50:06 +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] [PATCH v4 1/3] 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: Riccardo Schirone , Li Qiang , Jason Wang , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , 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: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Stefan Hajnoczi --- qemu-bridge-helper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) Reviewed v3 -> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg00245.html diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index f9940deefd..e90c22f07d 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -109,6 +109,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) { @@ -259,6 +266,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.21.0 From nobody Fri May 10 10:45:27 2024 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=1563879034; cv=none; d=zoho.com; s=zohoarc; b=Zh3iw/oORPPoMlt+U50vuKhWxpfUWH5Qiumvm67ZnyZoVHjYsNDAQuL34dIFTtM2k6oLHYWfHbPiYWfbzu/HSZr3sVpRYrjQuZsUEczeHC60ORF1htZpocWouvg02XIxXaKozAugrfPxX+2f/oJZAqmHhcSLxBaR4NfQdGRiTjE= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563879034; h=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=jUg4SGMzJydKEKBk6MNhNiFkPvLC45uHCBv0IMsl9R4=; b=c6MjF8MoPm1xgudjDPjW46rb9Gun32MPJwFcdFGQmZJqtd4irW6RYwMG6umw4N9L6dOwxD5Q0fn5NUDIQzz3c1ZgdlShdLH+yOiynCcf6bhesWoVZ7U90CzdNfkQ387MfDu/VA9W8IKX/N70n2dauCKBn6Ue+r8o7pPQfpNQ1ls= 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 1563879034404920.2188437039213; Tue, 23 Jul 2019 03:50:34 -0700 (PDT) Received: from localhost ([::1]:41200 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsNN-0007zb-7F for importer@patchew.org; Tue, 23 Jul 2019 06:50:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42621) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsN2-0006gB-1R for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsN0-0002wk-Ol for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43664) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpsN0-0002wO-Im for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:10 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E02E1307D971; Tue, 23 Jul 2019 10:50:09 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.205.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6C48519C6A; Tue, 23 Jul 2019 10:50:07 +0000 (UTC) From: P J P To: QEMU Developers Date: Tue, 23 Jul 2019 16:17:53 +0530 Message-Id: <20190723104754.29324-3-ppandit@redhat.com> In-Reply-To: <20190723104754.29324-1-ppandit@redhat.com> References: <20190723104754.29324-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.48]); Tue, 23 Jul 2019 10:50:09 +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] [PATCH v4 2/3] 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: Li Qiang , Jason Wang , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , 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: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang Reviewed-by: Stefan Hajnoczi --- qemu-bridge-helper.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) Reviewed v3: -> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg00247.html diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index e90c22f07d..91a02f9611 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -92,9 +92,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; @@ -111,9 +109,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) { @@ -139,15 +135,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.21.0 From nobody Fri May 10 10:45:27 2024 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=1563879048; cv=none; d=zoho.com; s=zohoarc; b=adQFG7RKCIqeu7aMDODNIntdZ1kS6p9ETzJj0sAnoR2nvbsDAxMOBrOM8ATiH0oyCuyyREIUcFFjwaaI8AZ34DgHsl50F/RSNnB727Wkcx3iJGLBCdshy2kDIAscbnIcGlitHyJuClpTv4Qp0yAuFJrvexSEruOfBFxrEtzkKOo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1563879048; h=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=VENQoOrCJd+DM3HJ0Z5qM5/zzPUWL9zC3HFK8StayEM=; b=GOz656OcCydQeOeahAtDBsi8MfVtIVQqzu3uCwhwklToiKmUddi1qA7B+BFVgf4Zdi56gLkF+KU7zrYGZIQVsu0NG8NRmCP3yhuJhlbX1b8orIzLWA/xDlF6TQVnxzPFnF1mACAT6/F8LVI+qOJkpDRgmoFC4l1eNmz1IBh2I5c= 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 1563879048849829.3513418083596; Tue, 23 Jul 2019 03:50:48 -0700 (PDT) Received: from localhost ([::1]:41208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsNb-0000jX-Te for importer@patchew.org; Tue, 23 Jul 2019 06:50:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42660) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hpsN8-0007CG-BX for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hpsN7-00031a-5P for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:18 -0400 Received: from mx1.redhat.com ([209.132.183.28]:41520) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hpsN6-000313-U3 for qemu-devel@nongnu.org; Tue, 23 Jul 2019 06:50:17 -0400 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3CD4D308FBAC; Tue, 23 Jul 2019 10:50:16 +0000 (UTC) Received: from localhost.localdomain (unknown [10.40.205.46]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B9F319C58; Tue, 23 Jul 2019 10:50:10 +0000 (UTC) From: P J P To: QEMU Developers Date: Tue, 23 Jul 2019 16:17:54 +0530 Message-Id: <20190723104754.29324-4-ppandit@redhat.com> In-Reply-To: <20190723104754.29324-1-ppandit@redhat.com> References: <20190723104754.29324-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.43]); Tue, 23 Jul 2019 10:50:16 +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] [PATCH v4 3/3] 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: Li Qiang , Jason Wang , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , 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: Daniel P. Berrang=C3=A9 Reviewed-by: Li Qiang --- net/tap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) Update v4: only replace snprintf with g_strdup_printf calls -> https://lists.nongnu.org/archive/html/qemu-devel/2019-07/msg00578.html diff --git a/net/tap.c b/net/tap.c index e8aadd8d4b..fc38029f41 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.21.0