From nobody Tue Feb 10 04:15:59 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1598941553; cv=none; d=zohomail.com; s=zohoarc; b=femFZ4jgpLDzZfMgV2HhfaBIez7qpe5EZUMGvVw3wXKVgdRxxzOFsls4HyXZAw0SH6QkNK0RNA8wXZdY0Lp6/rnZEGqtpQAvdEJ5dRPJtiTIJ6Une/hAPUpC1373u02ZWaTBOXBEeeUKP84sJDQGIsER7XYdI7zhzpbQcWJoFiM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1598941553; 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; bh=VPwMOZku7UBRQhHSdhV1lO2uk4iu6y/xIf7/rYHqH0c=; b=l3zF0iegthWNzBZyjH4Mo68bA096E/5dM08xwaEjH6fdnOHCR9tjHkMILnBJzXohhhVbWopEcY8PDFpMULavsldqLSq3XEu3j+stMZFodCyNLltQjyqJsHZuIT6op0gdkOCSUF055BQTNDebcNKYtf2bSodROmDmkfR6kukFSgQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass 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 1598941553457921.7445643274131; Mon, 31 Aug 2020 23:25:53 -0700 (PDT) Received: from localhost ([::1]:49316 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kCzjr-00006Q-UR for importer@patchew.org; Tue, 01 Sep 2020 02:25:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:44406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kCzei-00067X-Dv for qemu-devel@nongnu.org; Tue, 01 Sep 2020 02:20:32 -0400 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:42909 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kCzee-0000nP-K4 for qemu-devel@nongnu.org; Tue, 01 Sep 2020 02:20:32 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-94-CzBJ730JOJ-lbBQ9LgPPBA-1; Tue, 01 Sep 2020 02:20:26 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 545FF10066FC; Tue, 1 Sep 2020 06:20:25 +0000 (UTC) Received: from virtlab701.virt.lab.eng.bos.redhat.com (virtlab701.virt.lab.eng.bos.redhat.com [10.19.152.228]) by smtp.corp.redhat.com (Postfix) with ESMTP id 1143178B26; Tue, 1 Sep 2020 06:20:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598941227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VPwMOZku7UBRQhHSdhV1lO2uk4iu6y/xIf7/rYHqH0c=; b=BDeqmTl+jRjjYJOAfaoRmWaeG61R1C41FhQdEoQWDdNip6+JOfFhybzHJ12Ohgl6I+ONGv 3nl3Z71FEcKeuIv427nrrc1u7+55wEf8OFnsnnwz63kSbj6gl7n7eM3SlvQKDUWfqqr/PJ MkGNwiZkHU2aeAm4AafEdNd1RXnfsXY= X-MC-Unique: CzBJ730JOJ-lbBQ9LgPPBA-1 From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 10/13] qemu-bridge-helper: relocate path to default ACL Date: Tue, 1 Sep 2020 02:20:17 -0400 Message-Id: <20200901062020.26660-11-pbonzini@redhat.com> In-Reply-To: <20200901062020.26660-1-pbonzini@redhat.com> References: <20200901062020.26660-1-pbonzini@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pbonzini@redhat.com X-Mimecast-Spam-Score: 0.0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=205.139.110.120; envelope-from=pbonzini@redhat.com; helo=us-smtp-1.mimecast.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/08/31 22:05:54 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: Mark Cave-Ayland Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- qemu-bridge-helper.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/qemu-bridge-helper.c b/qemu-bridge-helper.c index 88b26747fc..a26e1663f0 100644 --- a/qemu-bridge-helper.c +++ b/qemu-bridge-helper.c @@ -40,6 +40,7 @@ #endif =20 #include "qemu/queue.h" +#include "qemu/cutils.h" =20 #include "net/tap-linux.h" =20 @@ -245,6 +246,7 @@ int main(int argc, char **argv) ACLList acl_list; int access_allowed, access_denied; int ret =3D EXIT_SUCCESS; + g_autofree char *acl_file =3D NULL; =20 #ifdef CONFIG_LIBCAP_NG /* if we're run from an suid binary, immediately drop privileges prese= rving @@ -257,6 +259,8 @@ int main(int argc, char **argv) } #endif =20 + qemu_init_exec_dir(argv[0]); + /* parse arguments */ for (index =3D 1; index < argc; index++) { if (strcmp(argv[index], "--use-vnet") =3D=3D 0) { @@ -282,9 +286,10 @@ int main(int argc, char **argv) =20 /* parse default acl file */ QSIMPLEQ_INIT(&acl_list); - if (parse_acl_file(DEFAULT_ACL_FILE, &acl_list) =3D=3D -1) { + acl_file =3D get_relocated_path(DEFAULT_ACL_FILE); + if (parse_acl_file(acl_file, &acl_list) =3D=3D -1) { fprintf(stderr, "failed to parse default acl file `%s'\n", - DEFAULT_ACL_FILE); + acl_file); ret =3D EXIT_FAILURE; goto cleanup; } --=20 2.26.2