From nobody Fri May 17 10:34:20 2024 Delivered-To: importer@patchew.org Received-SPF: none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) client-ip=8.43.85.245; envelope-from=devel-bounces@lists.libvirt.org; helo=lists.libvirt.org; Authentication-Results: mx.zohomail.com; spf=none (zohomail.com: 8.43.85.245 is neither permitted nor denied by domain of lists.libvirt.org) smtp.mailfrom=devel-bounces@lists.libvirt.org; dmarc=fail(p=quarantine dis=quarantine) header.from=suse.com Return-Path: Received: from lists.libvirt.org (lists.libvirt.org [8.43.85.245]) by mx.zohomail.com with SMTPS id 1712610824601821.6684201702515; Mon, 8 Apr 2024 14:13:44 -0700 (PDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7BBA21975; Mon, 8 Apr 2024 17:13:43 -0400 (EDT) Received: from lists.libvirt.org (localhost [IPv6:::1]) by lists.libvirt.org (Postfix) with ESMTP id C61AE191B; Mon, 8 Apr 2024 17:13:13 -0400 (EDT) Received: by lists.libvirt.org (Postfix, from userid 996) id 7FCBD18D6; Mon, 8 Apr 2024 17:13:10 -0400 (EDT) Received: from mail-lj1-f176.google.com (mail-lj1-f176.google.com [209.85.208.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.libvirt.org (Postfix) with ESMTPS id 53BF81913 for ; Mon, 8 Apr 2024 17:13:09 -0400 (EDT) Received: by mail-lj1-f176.google.com with SMTP id 38308e7fff4ca-2d476d7972aso63874851fa.1 for ; Mon, 08 Apr 2024 14:13:09 -0700 (PDT) Received: from localhost (75-169-5-227.slkc.qwest.net. [75.169.5.227]) by smtp.gmail.com with ESMTPSA id b30-20020a026f5e000000b0047f13b719besm2841700jae.88.2024.04.08.14.13.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 14:13:07 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on lists.libvirt.org X-Spam-Level: X-Spam-Status: No, score=-0.8 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE autolearn=unavailable autolearn_force=no version=3.4.4 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712610788; x=1713215588; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hHWfN0oNGMB65Cs/W9RAVJFdOwzrw9CDSbHbGSgM0JM=; b=B/gytjLw1fTgxoRo6oVl3Pws9BNGT5OHpCCnSrxJ/+txb79ktenrLaG9kgHuBdb2Ti IjMwh2yT/vVlkGH2+xguMDUVkb+F1vZqX1zyGTUycsyMwnoXmxeSPwv3udIyerqUafp4 X2tjt1qVBnntkyTefb7yUgbgsjcFJ7kQgKPukMa9PhfLzVM8uGHI+qWZBECNBEXDaef1 aka4VzLfpHS4n75APst+dBdPyLDLCONt/ozr2LdYSWiJj6X4y5cFN9AYQXG0H3PKgxJQ YfpU3OM+PGJsX+Q/GY9YikrhAYJxh5RZD9rV7U/M4rjuIdVLJzXdupVsOOn64k1PkXcP 359Q== X-Gm-Message-State: AOJu0YwX2nXKaEySL3LtBnxX3NZreKpSNKheSV3YmnhMB2mqQik88I3e LsnJLcODoNQjtJFSLovThTPf9hpcQNW5VCUGrXwwoSkrjQ6YfXX/DqSI6qTUsMwjnWfbln99qJE 6 X-Google-Smtp-Source: AGHT+IG2AkGitMfTkP5XcFo0v2RvGQccq2+vgXs9wRuzqaw650m5g5fvKtKKodjWH6N2EIUAraw/lQ== X-Received: by 2002:a2e:9852:0:b0:2d8:781c:7ba1 with SMTP id e18-20020a2e9852000000b002d8781c7ba1mr4522982ljj.7.1712610787749; Mon, 08 Apr 2024 14:13:07 -0700 (PDT) From: Jim Fehlig To: devel@lists.libvirt.org Subject: [PATCH] qemusecuritytest: Don't call real virFileExists in mock Date: Mon, 8 Apr 2024 15:12:11 -0600 Message-ID: <20240408211306.28391-1-jfehlig@suse.com> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 Message-ID-Hash: 64SC5L57UUNNPEVMF4K77TT4STJJH47E X-Message-ID-Hash: 64SC5L57UUNNPEVMF4K77TT4STJJH47E X-MailFrom: jfehlig@suse.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-config-1; header-match-config-2; header-match-config-3; header-match-devel.lists.libvirt.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; suspicious-header X-Mailman-Version: 3.2.2 Precedence: list List-Id: Development discussions about the libvirt library & tools Archived-At: List-Archive: List-Help: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZM-MESSAGEID: 1712610825366100001 Calling the real virFileExists in qemusecuritymock.c can cause a segfault in qemusecuritytest. No segfaults are noticed when calling access(2) instead of virFileExists. Fixes: 4ed5ade753d8f1136cdbf17ddfe1d9093bcd933d Signed-off-by: Jim Fehlig --- Pushing as a build-breaker fix. tests/qemusecuritymock.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/qemusecuritymock.c b/tests/qemusecuritymock.c index a7bb1f8bea..dc8a893e9d 100644 --- a/tests/qemusecuritymock.c +++ b/tests/qemusecuritymock.c @@ -66,7 +66,6 @@ static int (*real_close)(int fd); static int (*real_setfilecon_raw)(const char *path, const char *context); static int (*real_getfilecon_raw)(const char *path, char **context); #endif -static bool (*real_virFileExists)(const char *file); =20 =20 /* Global mutex to avoid races */ @@ -124,7 +123,6 @@ init_syms(void) VIR_MOCK_REAL_INIT(setfilecon_raw); VIR_MOCK_REAL_INIT(getfilecon_raw); #endif - VIR_MOCK_REAL_INIT(virFileExists); =20 /* Intentionally not calling init_hash() here */ } @@ -389,7 +387,7 @@ bool virFileExists(const char *path) VIR_LOCK_GUARD lock =3D virLockGuardLock(&m); =20 if (getenv(ENVVAR) =3D=3D NULL) - return real_virFileExists(path); + return access(path, F_OK) =3D=3D 0; =20 init_hash(); if (virHashHasEntry(chown_paths, path)) --=20 2.44.0 _______________________________________________ Devel mailing list -- devel@lists.libvirt.org To unsubscribe send an email to devel-leave@lists.libvirt.org