From nobody Sun Jul 26 10:07:32 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=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1785027268; cv=none; d=zohomail.com; s=zohoarc; b=J3F+q+PEOYwt02P/NommZ40AhbQ+757Ae79rdkhCsQyM9+9Mc4OIFb+UtRRk/eMy36u2WLVureX0gfg5URElsBBDpivm1jQeHo5k7F0UIt1ZYi7IjEKmVwTqApv23LG6uL17LcuVrEgQrpgrlZZoL43EHSfONoOKk/XHQtLn/2Y= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785027268; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=pVwlgtmgEc3axuYS6KKLOPY8UyUmHfC6AB1k/zPj/1o=; b=cNeZnIv6DKjX1aPdE4Kq0wu6cVzbbSCPoGVpXUDMs1fG4hw0+fCigyQyNyxEPUW+hOgAHHo2x2R4tJv3n1wlF+Ek3O0rUyZirMF+eBO2C61ubgQ5kKaEMXuKWEG3GAJ+He0DGE5FZWNANyFH+vJDgaPtEPK2LAkr/0CI+7P2zck= 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) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785027268907499.0674676514426; Sat, 25 Jul 2026 17:54:28 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wnn7c-00036X-RN; Sat, 25 Jul 2026 20:53:40 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wnn7a-000369-1c for qemu-devel@nongnu.org; Sat, 25 Jul 2026 20:53:39 -0400 Received: from mail-yx1-xb136.google.com ([2607:f8b0:4864:20::b136]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wnn7Y-0007Cz-EG for qemu-devel@nongnu.org; Sat, 25 Jul 2026 20:53:37 -0400 Received: by mail-yx1-xb136.google.com with SMTP id 956f58d0204a3-66804667af2so1131998d50.0 for ; Sat, 25 Jul 2026 17:53:35 -0700 (PDT) Received: from localhost (host05.distrikthotelips2.d.subnet.rcn.com. [207.96.107.85]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-668c6f696f7sm1373041d50.11.2026.07.25.17.53.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 25 Jul 2026 17:53:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785027215; x=1785632015; darn=nongnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=pVwlgtmgEc3axuYS6KKLOPY8UyUmHfC6AB1k/zPj/1o=; b=aRbPvq2xDmNjDuc4PpgOFXvtg4xz0dPGRcVdrGEsVuSWgxHN6+HR6vpFw7IEsPAHWH lsZqFuH8rVQARAaQtKSqChJHBGflkGwvAf07N2KunnYQYhJgwxcDViod6yNd329pURtG 66FyG9CsElZ9xYyqbgeQehtThdZ2k+m2Ldp8TLIwY2PxUayYCuIYRKDghM7LS9nJo57V OsN9mOJqfQBIp8H+nBuQ2/3OUBTPOVZ/SmbBLDSrblcI4IetuPvt2+oZi8kKnY62j6cE 86c574/jyvOFY6Md/pTrcXj//qXuEry2QXkQkhEI5USQENIhoA25Ow+cABlQvc+SbMBs lBmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785027215; x=1785632015; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=pVwlgtmgEc3axuYS6KKLOPY8UyUmHfC6AB1k/zPj/1o=; b=EvZDOSUkONx0dcpQP/lBbUPUt/hRB0tT3fYijqeaOxJmvtXOhvbYDEh02PRrglxibf p1pKvEo4IdZgwLaGem45hJeEA1yrRrKZkOgf5jM45YJVEOpAZCE7d/dY11bbEv/br1pv mDVn8JKXWkfy/8sOQweN2I4TmYgxm9kal5xlYW97gH8A3cXyL2YY23a9JfsBKGnFDd5X A2sTnHkFhGLtUBazabOLtdabbiEASRAcErxMZMyhYaqY9c+/M+ykh+CGz8tv7KWuZ06A TTMaOJyJJ9/n9OSIzNqptVDMCP+DRkNGA18PEt8iRVAuLWeRwLRBl1hdW2EgBAiJj/rK qBlQ== X-Gm-Message-State: AOJu0YwcIQFllA6GnqCSdsnerLsjjZjJc8VVeRa6oi2TWgTiPBmOHitq Fw7r+yMkb++bw0MY2RVEsL7iZ6/6a9lXkA/vTGhHudnlOU0jMDw/FXIia/t0mA== X-Gm-Gg: AR+sD11j+vB6EvXYkBd1BMkT2JG9H7qpt9KVvhoEB5VosDmH8tZ3gA5CqLWZwK8NYGT LTO+WhRDvSPZA7t5V+G11/vOjnwt1RqDI++eap/18PrZ87Ziz1vkLTuNUhgGjYdD7A11VeE0Wwy fL0sesTwZoLdIHghLvWKtUwahrEKfYSEFY1dHIBXaGBffztYfFIZMX/Ro84QAEgF1H7afNYdl6A 3S+x+fDZA7ksCf4hskotI40AMac9wEwO+rfVx639n5DzM9JxClAExBdr6VBgSBOctFvOZ+j5P3F +pkd5Um1hUO5WyA8xGrkfdfnj+OGPryxvIjRkA0+wVO3lK5F0H+DezseLGYQVoQsh3efEjUQ51v pIQoi/wGdD1MEBAFvu942V3Kj9UEeT1lNZghOirEJq6RFqS3R07POSaTmGc4N/uPnhLcYS2KaD/ PiJlHLtbr/5MNj+g4LVqU/lyLYKIoWgGegtjzm/RnfG58qJx0aVcZNTA== X-Received: by 2002:a05:690e:4093:b0:668:11e1:1709 with SMTP id 956f58d0204a3-668c7b58223mr1238758d50.98.1785027214803; Sat, 25 Jul 2026 17:53:34 -0700 (PDT) From: Matt Turner To: qemu-devel@nongnu.org Cc: Richard Henderson , Laurent Vivier , Helge Deller , Pierrick Bouvier , Matt Turner Subject: [PATCH] linux-user: fix guards for the fsmount(2) syscall series Date: Sat, 25 Jul 2026 20:53:28 -0400 Message-ID: <20260726005328.2511963-1-mattst88@gmail.com> X-Mailer: git-send-email 2.54.0 MIME-Version: 1.0 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=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::b136; envelope-from=mattst88@gmail.com; helo=mail-yx1-xb136.google.com X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_ENVFROM_END_DIGIT=0.25, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, 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.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1785027272652154100 Content-Type: text/plain; charset="utf-8" The fsopen(), fsconfig(), fsmount() and fspick() implementations are guarded by defined(NR_fsopen) rather than defined(__NR_fsopen). No such macro exists, so the guard is never true and the entire series compiles out. Guests calling any of the four get -ENOSYS, which for example makes systemd's credential setup fail with EXIT_CREDENTIALS for most units. The strace bits for fsconfig() have the same typo. Fixes: 767c32fe6983 ("linux-user: implement fsmount(2) series of syscalls") Fixes: 6e0aa9f6c731 ("linux-user/strace: add fsmount series of syscalls") Signed-off-by: Matt Turner --- linux-user/strace.c | 2 +- linux-user/strace.list | 2 +- linux-user/syscall.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git ./linux-user/strace.c ./linux-user/strace.c index 3a81cc95f4..d861f311f6 100644 --- ./linux-user/strace.c +++ ./linux-user/strace.c @@ -4344,7 +4344,7 @@ print_statx(CPUArchState *cpu_env, const struct sysca= llname *name, } #endif =20 -#if defined(TARGET_NR_fsconfig) && defined(NR_fsconfig) +#ifdef TARGET_NR_fsconfig static void print_fsconfig_cmd_name(int cmd) { diff --git ./linux-user/strace.list ./linux-user/strace.list index e363892e0a..3a366b8cac 100644 --- ./linux-user/strace.list +++ ./linux-user/strace.list @@ -1725,7 +1725,7 @@ #ifdef TARGET_NR_fsopen { TARGET_NR_fsopen, "fsopen", "%s(%s,%d)", NULL, NULL }, #endif -#if defined(TARGET_NR_fsconfig) && defined(NR_fsconfig) +#ifdef TARGET_NR_fsconfig { TARGET_NR_fsconfig, "fsconfig", NULL, print_fsconfig, NULL }, #endif #ifdef TARGET_NR_fsmount diff --git ./linux-user/syscall.c ./linux-user/syscall.c index 3da5530d42..740142825d 100644 --- ./linux-user/syscall.c +++ ./linux-user/syscall.c @@ -9740,7 +9740,7 @@ _syscall5(int, sys_move_mount, int, __from_dfd, const= char *, __from_pathname, int, __to_dfd, const char *, __to_pathname, unsigned int, flag) #endif =20 -#if defined(TARGET_NR_fsopen) && defined(NR_fsopen) +#if defined(TARGET_NR_fsopen) && defined(__NR_fsopen) #define __NR_sys_fsopen __NR_fsopen _syscall2(int, sys_fsopen, const char *, fs_name, unsigned int, flags); #define __NR_sys_fsconfig __NR_fsconfig @@ -14485,7 +14485,7 @@ static abi_long do_syscall1(CPUArchState *cpu_env, = int num, abi_long arg1, return do_map_shadow_stack(cpu_env, arg1, arg2, arg3); #endif =20 -#if defined(TARGET_NR_fsopen) && defined(NR_fsopen) +#if defined(TARGET_NR_fsopen) && defined(__NR_fsopen) case TARGET_NR_fsopen: { p =3D lock_user_string(arg1); --=20 2.54.0