From patchwork Sat May 26 05:23:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Keno Fischer X-Patchwork-Id: 920921 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=juliacomputing.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=juliacomputing-com.20150623.gappssmtp.com header.i=@juliacomputing-com.20150623.gappssmtp.com header.b="iRtdmAIJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40tBZk31c5z9s0y for ; Sat, 26 May 2018 15:32:14 +1000 (AEST) Received: from localhost ([::1]:47837 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMRoJ-0003no-6X for incoming@patchwork.ozlabs.org; Sat, 26 May 2018 01:32:11 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35799) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fMRgc-0006MG-DC for qemu-devel@nongnu.org; Sat, 26 May 2018 01:24:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fMRgb-0004ar-Ec for qemu-devel@nongnu.org; Sat, 26 May 2018 01:24:14 -0400 Received: from mail-qk0-x232.google.com ([2607:f8b0:400d:c09::232]:45074) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fMRgb-0004aD-AZ for qemu-devel@nongnu.org; Sat, 26 May 2018 01:24:13 -0400 Received: by mail-qk0-x232.google.com with SMTP id c198-v6so5676569qkg.12 for ; Fri, 25 May 2018 22:24:13 -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=iuAUA++ABcIYYB0QNoTZ4KtxjVeZlALxuFtCdhGutBU=; b=iRtdmAIJ4ZYJBivyftP318H1EOKFfM/IfQ1hVHiuO+WlRmGTk0uCyBy+5sr43HjUWA OOwPLs0zz0DL1iAgHB3HXqb7nqA/KVGLp1qW/qUD0Q9VMBgLz2U3Wp4eVTBDBRS3l1fx cuGr6nq73XEOzqvcXIHwpZ5sH+SGz2JqYPPjGyJSkg87myn6j6YGyytULeDOBxpqRg2G p2eC+cyS+zPnNioLMpoUeypylmQWg30b5OsetCrbwBeefpgPuca1JpsHVE9EfT0v9kmP akvwJHvahiOWN9NJ7gIQCjVVjOlecO7Xym68Yj+iLCO/nsApqmWhQ9E5ut/BZ5FyOomf HlIg== 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=iuAUA++ABcIYYB0QNoTZ4KtxjVeZlALxuFtCdhGutBU=; b=JC6rbpR9+2yvhZ3ZuTDgIHpm6yPojnMsrmsreD8NhKuZpF0n7mZzgCySW80yBuRFoR PLrJjislmMsmau3qkEMwgBxUM3hsWaWPIY+NqlBMfVQ0/CW1xRTqwikmqdcMqQLeHNBk fHSL4kHygR1ZzQTYxvtz6jBpxAYtdqyb34Di15KipP3ZCXCajYZT6lpHzRPBbzXfXl+C FkwP8+81Gp7OmnOQY7wwvhVh9gtSxg5b0emX1Zg0ZkFVb9gGwHcRwS/9CPriTU/7KbCS yQz4H6FTcyvJPjMmiBgmnduaWdvI59+1ZlbIMz0HmYpCIVYYKXeYLyC9MF/Nmqlpr16v snow== X-Gm-Message-State: ALKqPwc3pbRi7/OtUboQLAyHDLft/yPJHMnX5LoxbNq8PpvXHwzudck3 4t3ApyIAjG6xplgUqKYiHHzmQnQ5uiA= X-Google-Smtp-Source: ADUXVKIwl658Dbw2GqOE6GS/lplONjyC0/IjojFE/r3vtwcniCI73W11WrvPWPxO5zg2i+VR9Bekmg== X-Received: by 2002:a37:cf82:: with SMTP id v2-v6mr4664796qkl.67.1527312252387; Fri, 25 May 2018 22:24:12 -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.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 25 May 2018 22:24:11 -0700 (PDT) From: keno@juliacomputing.com To: qemu-devel@nongnu.org Date: Sat, 26 May 2018 01:23:12 -0400 Message-Id: <981de427dbb657d58d08f216b40255b132cb1596.1527310210.git.keno@alumni.harvard.edu> 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:c09::232 Subject: [Qemu-devel] [PATCH 10/13] 9p: darwin: *xattr_nofollow implementations 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+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Keno Fischer Signed-off-by: Keno Fischer --- hw/9pfs/9p-util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 45 insertions(+), 4 deletions(-) diff --git a/hw/9pfs/9p-util.c b/hw/9pfs/9p-util.c index 8cf5554..98004ac 100644 --- a/hw/9pfs/9p-util.c +++ b/hw/9pfs/9p-util.c @@ -17,49 +17,90 @@ ssize_t fgetxattrat_nofollow(int dirfd, const char *filename, const char *name, void *value, size_t size) { - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); int ret; +#ifdef CONFIG_DARWIN + int fd = openat_file(dirfd, filename, O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) + return -1; + + ret = fgetxattr(fd, name, value, size, 0, XATTR_NOFOLLOW); + close_preserve_errno(fd); +#else + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); ret = lgetxattr(proc_path, name, value, size); g_free(proc_path); +#endif return ret; } ssize_t fgetxattr_follow(int fd, const char *name, void *value, size_t size) { +#ifdef CONFIG_DARWIN + return fgetxattr(fd, name, value, size, 0, 0); +#else return fgetxattr(fd, name, value, size); +#endif } ssize_t flistxattrat_nofollow(int dirfd, const char *filename, char *list, size_t size) { - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); int ret; +#ifdef CONFIG_DARWIN + int fd = openat_file(dirfd, filename, O_RDONLY | O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) + return -1; + + ret = flistxattr(fd, list, size, XATTR_NOFOLLOW); + close_preserve_errno(fd); +#else + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); ret = llistxattr(proc_path, list, size); g_free(proc_path); +#endif return ret; } ssize_t fremovexattrat_nofollow(int dirfd, const char *filename, const char *name) { - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); int ret; +#ifdef CONFIG_DARWIN + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) + return -1; + + ret = fremovexattr(fd, name, XATTR_NOFOLLOW); + close_preserve_errno(fd); + return ret; +#else + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); ret = lremovexattr(proc_path, name); g_free(proc_path); return ret; +#endif } int fsetxattrat_nofollow(int dirfd, const char *filename, const char *name, void *value, size_t size, int flags) { - char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); int ret; +#ifdef CONFIG_DARWIN + int fd = openat_file(dirfd, filename, O_PATH_9P_UTIL | O_NOFOLLOW, 0); + if (fd == -1) + return -1; + + ret = fsetxattr(fd, name, value, size, 0, XATTR_NOFOLLOW); + close_preserve_errno(fd); +#else + char *proc_path = g_strdup_printf("/proc/self/fd/%d/%s", dirfd, filename); ret = lsetxattr(proc_path, name, value, size, flags); g_free(proc_path); +#endif return ret; }