From nobody Sun May 5 10:48:52 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=1564565021; cv=none; d=zoho.com; s=zohoarc; b=VSPHVif1mJBUGI1oLSam7/phOGdBYO1UQMJucpaEVRMgtSeOpjUxKG9vTWZ+zdriVQQWcSUcYF0+K1ykrvqfSgZDiWJGpXS4ipRLx2/1polZVnWs9duGwGvp+Omp3mbmOz2D8/ylgr948uGN/fpPi14v5+WnqpVlUuK40CEAnHQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1564565021; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=MqM+H9MvcAOGhYVOvAyF6/PN5NbdFi88q4mfinOhbp8=; b=YxRXSpNwSR4PFJuxfHtLrSYKfeF2wx+mvnuCsY6CtFKMbUWTTIvdmPY7pqG4pPAkdTfUI7RMaxSgBgq9nK31CYoQbfyhgLdPoYR3Aq5pRupKEguBWtSZmqijCr45iLzlRyWaxfrPViJ4bXdr1U0vW+36fMDRvBtM78LkL0QxpjY= 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 156456502174226.386543501717938; Wed, 31 Jul 2019 02:23:41 -0700 (PDT) Received: from localhost ([::1]:39242 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hskpe-0002wf-OZ for importer@patchew.org; Wed, 31 Jul 2019 05:23:38 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59919) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hskpB-00029E-7G for qemu-devel@nongnu.org; Wed, 31 Jul 2019 05:23:10 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hskpA-0000Zq-0p for qemu-devel@nongnu.org; Wed, 31 Jul 2019 05:23:09 -0400 Received: from mx1.redhat.com ([209.132.183.28]:48870) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hskp9-0000Yl-Oy for qemu-devel@nongnu.org; Wed, 31 Jul 2019 05:23:07 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 1954881DF1; Wed, 31 Jul 2019 09:23:07 +0000 (UTC) Received: from localhost.localdomain (ovpn-116-38.phx2.redhat.com [10.3.116.38]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 623F85C1B5; Wed, 31 Jul 2019 09:22:56 +0000 (UTC) From: P J P To: Jason Wang Date: Wed, 31 Jul 2019 14:49:33 +0530 Message-Id: <20190731091933.17363-1-ppandit@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 31 Jul 2019 09:23:07 +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 v5] 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: Stefan Hajnoczi , Li Qiang , =?UTF-8?q?Daniel=20P=20=2E=20Berrang=C3=A9?= , QEMU Developers , 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(). If bridge name 'br_buf' is undefined, pass empty string ("") to g_strdup_printf() in its place, to avoid printing "(null)" string. Signed-off-by: Prasad J Pandit Reviewed-by: Markus Armbruster --- net/tap.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) Update v5: add commit message about conditional 'br_buf' argument -> https://lists.gnu.org/archive/html/qemu-devel/2019-07/msg06397.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