From nobody Mon May 13 05:10: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=1561985142; cv=none; d=zoho.com; s=zohoarc; b=P68I966+EaJ63DHaBh37SEx3PyYi+u/rVLGGJ8Sizk4hf6wRyAwtn0Qn6oTp10kKaN0p+KC8A0lUFsSwJdRxY4kqGKBOKbFzkjIt9YHlUPvpxWyap7V79Qaxx67xIm+2RfwAgfl2ZM/04rz/MrHVtPSiX0GXBh00IH4GEAc0z2w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561985142; 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=EnaAPUhFPfSnwExlM7JUVox+6br/k5Yj0XHXtR+hwrQ=; b=YIvgdFtwMHoaVAESo3P34YHbSfA6e4U3OdTOG0/vCpM3N95lopZb36PjfcWc5mDEezEj9OMK9eI7LOv6pkUduQhg3pNzhxV5roXBS3HiX7OyMGzQdyF4XQgsw/cUEs0dNZWYMKENUtoqyylyOnzSFDEGX3dtl1wEA+dKEvRGF4k= 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 1561985142449410.18345055099894; Mon, 1 Jul 2019 05:45:42 -0700 (PDT) Received: from localhost ([::1]:58363 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhvge-0001lJ-TX for importer@patchew.org; Mon, 01 Jul 2019 08:45:36 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59137) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhvZi-00039X-Q5 for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hhvZf-0008U3-0M for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:26 -0400 Received: from mx1.redhat.com ([209.132.183.28]:38920) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hhvZe-0008T5-QF for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:22 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F3D033086217; Mon, 1 Jul 2019 12:38:16 +0000 (UTC) Received: from localhost.localdomain (unknown [10.33.36.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id B4CDC18376; Mon, 1 Jul 2019 12:38:12 +0000 (UTC) From: P J P To: Qemu Developers Date: Mon, 1 Jul 2019 18:05:56 +0530 Message-Id: <20190701123558.30512-2-ppandit@redhat.com> In-Reply-To: <20190701123558.30512-1-ppandit@redhat.com> References: <20190701123558.30512-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.42]); Mon, 01 Jul 2019 12:38:17 +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 v3 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: Li Qiang --- qemu-bridge-helper.c | 11 +++++++++++ 1 file changed, 11 insertions(+) Update v3: use g_str_equal() and %zu for strlen() -> https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg00072.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 Mon May 13 05:10: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=1561985053; cv=none; d=zoho.com; s=zohoarc; b=eaRKZd3Zcr3DnbwRGTqnRPTX0qXz7Q5/babaxtP9wzj+vEVLizjT5jGWRWPF5ktL4j2BdEfxMkDfc7HaIELzH9Bd8jslKBVm1UwVsoKLylZt/hdW0lQmXumsPYgy6nahO7qyczJ92Ie0IJTQEQoR2sXUcWp0+b1V+3rbjrzDkFo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561985053; 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=1/F6i3yy3+EV7IsIqADpwNEW/f0tzoVLMjzI7CZ+iIs=; b=AlMoI5jaVvoCx1LPuNlQMeF2eBWWq3jpm7olU7SFn5hK+dcwEoWo8Cd89+wXGnUkJp+iz3++QJ0cZga+LPBx27cXJVv//zcohMmI8tUpdqM4VzCBTUmyQKD6c9LE8MNl5EzYnHPcHTVxM5begCptg2ynnBuWT1SRmzAJybiTRJU= 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 156198505357783.93401877106157; Mon, 1 Jul 2019 05:44:13 -0700 (PDT) Received: from localhost ([::1]:58328 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhvfI-00084n-97 for importer@patchew.org; Mon, 01 Jul 2019 08:44:12 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59257) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhvaC-0003JL-Fd for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:57 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hhva9-0000NY-3d for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:54 -0400 Received: from mx1.redhat.com ([209.132.183.28]:60714) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hhva8-00008j-Rj for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 6E03EC049589; Mon, 1 Jul 2019 12:38:27 +0000 (UTC) Received: from localhost.localdomain (unknown [10.33.36.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id AC6AD17CC0; Mon, 1 Jul 2019 12:38:18 +0000 (UTC) From: P J P To: Qemu Developers Date: Mon, 1 Jul 2019 18:05:57 +0530 Message-Id: <20190701123558.30512-3-ppandit@redhat.com> In-Reply-To: <20190701123558.30512-1-ppandit@redhat.com> References: <20190701123558.30512-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Mon, 01 Jul 2019 12:38:27 +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 v3 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: 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 Move repeating error handling sequence in parse_acl_file routine to an 'err' label. Signed-off-by: Prasad J Pandit Reviewed-by: Li Qiang --- 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 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 Mon May 13 05:10: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=1561985214; cv=none; d=zoho.com; s=zohoarc; b=dxneDkuOVvwMKJz/wuNEmsLFjMCoSJOHUtrelSBYdy++7fqnTyDVkhHRS0fKM1l4MKDuIjau8wZg852SPJh7/D1Q3fFRgbzpHvWehc5I92NKsdAcAMNb2f3Cmz2iz4mRtkYy2fghLK9wWqGqliD0/x0+UL4NtAw5uCjjQvOILu8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1561985214; 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=0FKajFnyMiiqepzxXFUdNKrI8XCJj8q8IlfKtZ03GPM=; b=Ydhll9Ec8zpLwNXas/+qtVK+3n1IbeN913ASYPbKfaONc48c/RVWqJTQdpW7OHuLHDdhSH0G0fXVCSmJKxdXEebbYetvzQ7VO5KK5bqYEbuZ93HM6LgC2CsdhdcFcXfkrCvHTDn6L7hcKCYMrNq1Nme/+uywdbymafb7Ef284E8= 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 1561985214377510.5189848578548; Mon, 1 Jul 2019 05:46:54 -0700 (PDT) Received: from localhost ([::1]:58364 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhvhn-0002Jw-53 for importer@patchew.org; Mon, 01 Jul 2019 08:46:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59260) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hhvaC-0003Jy-OJ for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:58 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hhva9-0000NP-3J for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:50894) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hhva8-0000BV-Ol for qemu-devel@nongnu.org; Mon, 01 Jul 2019 08:38:52 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7A0043091740; Mon, 1 Jul 2019 12:38:36 +0000 (UTC) Received: from localhost.localdomain (unknown [10.33.36.5]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 7B9AB18376; Mon, 1 Jul 2019 12:38:29 +0000 (UTC) From: P J P To: Qemu Developers Date: Mon, 1 Jul 2019 18:05:58 +0530 Message-Id: <20190701123558.30512-4-ppandit@redhat.com> In-Reply-To: <20190701123558.30512-1-ppandit@redhat.com> References: <20190701123558.30512-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.41]); Mon, 01 Jul 2019 12:38:36 +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 v3 3/3] net: tap: refactor net_bridge_run_helper routine 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 Refactor 'net_bridge_run_helper' routine to avoid buffer formatting to prepare 'helper_cmd' and using shell to invoke helper command. Instead directly execute helper program with due arguments. Signed-off-by: Prasad J Pandit --- net/tap.c | 43 +++++++++---------------------------------- 1 file changed, 9 insertions(+), 34 deletions(-) Update v3: remove buffer formatting and use of shell to invoke helper -> https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg00071.html diff --git a/net/tap.c b/net/tap.c index e8aadd8d4b..bc9b3407a6 100644 --- a/net/tap.c +++ b/net/tap.c @@ -478,7 +478,6 @@ static int net_bridge_run_helper(const char *helper, co= nst char *bridge, sigset_t oldmask, mask; int pid, status; char *args[5]; - char **parg; int sv[2]; =20 sigemptyset(&mask); @@ -498,9 +497,6 @@ 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]; =20 for (i =3D 3; i < open_max; i++) { if (i !=3D sv[1]) { @@ -508,39 +504,18 @@ 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]); + args[0] =3D (char *)helper; + args[1] =3D (char *)"--use-vnet"; + args[2] =3D g_strdup_printf("%s%d", "--fd=3D", sv[1]); + args[3] =3D g_strdup_printf("%s%s", "--br=3D", bridge); + args[4] =3D NULL; =20 - if (strrchr(helper, ' ') || strrchr(helper, '\t')) { - /* assume helper is a command */ + execv(helper, args); =20 - if (strstr(helper, "--br=3D") =3D=3D NULL) { - snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=3D", bridge= ); - } + g_free(args[2]); + g_free(args[3]); + fprintf(stderr, "failed to execute helper: %s\n", helper); =20 - snprintf(helper_cmd, sizeof(helper_cmd), "%s %s %s %s", - helper, "--use-vnet", fd_buf, br_buf); - - parg =3D args; - *parg++ =3D (char *)"sh"; - *parg++ =3D (char *)"-c"; - *parg++ =3D helper_cmd; - *parg++ =3D NULL; - - execv("/bin/sh", args); - } else { - /* assume helper is just the executable path name */ - - snprintf(br_buf, sizeof(br_buf), "%s%s", "--br=3D", bridge); - - parg =3D args; - *parg++ =3D (char *)helper; - *parg++ =3D (char *)"--use-vnet"; - *parg++ =3D fd_buf; - *parg++ =3D br_buf; - *parg++ =3D NULL; - - execv(helper, args); - } _exit(1); =20 } else { --=20 2.21.0