From nobody Sun Nov 2 12:04:14 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1527312557803645.4005677684011; Fri, 25 May 2018 22:29:17 -0700 (PDT) Received: from localhost ([::1]:47823 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMRlU-0001o5-31 for importer@patchew.org; Sat, 26 May 2018 01:29:16 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35767) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMRgZ-0006JN-Nf for qemu-devel@nongnu.org; Sat, 26 May 2018 01:24:12 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMRgW-0004Xj-Oj for qemu-devel@nongnu.org; Sat, 26 May 2018 01:24:11 -0400 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:38175) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMRgW-0004XT-KG for qemu-devel@nongnu.org; Sat, 26 May 2018 01:24:08 -0400 Received: by mail-qt0-x241.google.com with SMTP id m9-v6so9187948qtb.5 for ; Fri, 25 May 2018 22:24:08 -0700 (PDT) Received: from localhost.localdomain (96-86-104-61-static.hfc.comcastbusiness.net. [96.86.104.61]) by smtp.gmail.com with ESMTPSA id n128-v6sm17675166qkf.42.2018.05.25.22.24.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 May 2018 22:24:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=juliacomputing-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=e7r3yzMhtjcJ6xD6ewGNWlNtpd1fCg7F+3M56mnaSjU=; b=i9F9yoGWC3MUtixihmbJ9AgcVmH44Z/lOqI4/gxXSpLg9i1/sl/VOJL5OWjcuTB9hT B7XT2Bh8VndOCdfXuOMXdJEGXmnwSH0mA1VU2Tm2VnPY2koEMOBiXTQ5w+eLPfwI96ir JkJE/nAKiVOweZ7zPSZYrga/YgpYg5iEdZrHUir9Xky81Vw+l1orj+cYqhxUf0VOEWgH 5vaLb75RtCRooLplSiW5BnECXWxlwy+taE6Tk6wvWh1DEAw8HzGlOyl9e1PjfO4EwJRP AXZ2+TSNhGsvsj69ROC4xOXhi1bfOUqi54MJ1LPb87vmU4u5p6Jrci7l5W1t1l7SkWXt rs7g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; bh=e7r3yzMhtjcJ6xD6ewGNWlNtpd1fCg7F+3M56mnaSjU=; b=mt0p8yItrlatMXJKiM4QEjD4bCOY/UZoJ4yrm8Ls4iZW3zpJfllhgP3UbJ1Nl7e8Bo 9baZxPAlMP0mL33hLMMqyCX2Ps2OlwwqOu7buJzeIBxQ4XeZDF3hmDLV2hXVEFJn1TOs ESbt2ruRhQ3NDutrB5tzCGZyazC3gfxv2t2LtuUWPj5bNV/sdhYvG5K/UeDPTphEcEKI S8RymHg+K9dzEoTUikrC4yb2KhbGehT63pUZnW3bVqJN2xpA55K4ZGpzv2W4dAF9KtoO OBlnE1FoNhq/0HR+DiD+Bf8O7OMfL4SHL6cH3BClC9h6jMN8yA+AJsJmdyeLpXFf1XBQ av7g== X-Gm-Message-State: ALKqPwed6tS4ZP+vyGBtQXNt64zBKla/jR3qgHQgUuhFis1A06c4Cxnh LBcWauPuzUIlDq4pWIWX4NJ4yQl0yMY= X-Google-Smtp-Source: ADUXVKJHsi9FlLOyaMPMrJGstMUUyDUzPbeHPuEQi9FKL2dfhWMh9agsXTnu7ppyf6tlFE4E6NJZDQ== X-Received: by 2002:aed:3a46:: with SMTP id n64-v6mr5091676qte.118.1527312247714; Fri, 25 May 2018 22:24:07 -0700 (PDT) From: keno@juliacomputing.com To: qemu-devel@nongnu.org Date: Sat, 26 May 2018 01:23:09 -0400 Message-Id: X-Mailer: git-send-email 2.8.1 In-Reply-To: References: In-Reply-To: References: X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH 07/13] 9p: darwin: Properly translate AT_REMOVEDIR flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Keno Fischer , Keno Fischer , groug@kaod.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: Keno Fischer This code relied on P9_DOTL_AT_REMOVEDIR and AT_REMOVEDIR having the same numerical value, but on Darwin, they do not. Signed-off-by: Keno Fischer --- hw/9pfs/9p-local.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index 6e0b2e8..c55ea25 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -1376,7 +1376,17 @@ static int local_unlinkat(FsContext *ctx, V9fsPath *= dir, return -1; } =20 - ret =3D local_unlinkat_common(ctx, dirfd, name, flags); + if ((flags & ~P9_DOTL_AT_REMOVEDIR) !=3D 0) { + errno =3D EINVAL; + return -1; + } + + size_t rflags =3D 0; + if (flags & P9_DOTL_AT_REMOVEDIR) { + rflags |=3D AT_REMOVEDIR; + } + + ret =3D local_unlinkat_common(ctx, dirfd, name, rflags); close_preserve_errno(dirfd); return ret; } --=20 2.8.1