From patchwork Fri Jun 30 13:21:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Hajnoczi X-Patchwork-Id: 9819605 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 79460603F2 for ; Fri, 30 Jun 2017 13:22:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6A7662865F for ; Fri, 30 Jun 2017 13:22:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F3982867C; Fri, 30 Jun 2017 13:22:02 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 08DAB28668 for ; Fri, 30 Jun 2017 13:22:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751935AbdF3NWB (ORCPT ); Fri, 30 Jun 2017 09:22:01 -0400 Received: from mx1.redhat.com ([209.132.183.28]:35300 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751659AbdF3NWB (ORCPT ); Fri, 30 Jun 2017 09:22:01 -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 mx1.redhat.com (Postfix) with ESMTPS id A154A7CE09; Fri, 30 Jun 2017 13:22:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com A154A7CE09 Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx04.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=stefanha@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com A154A7CE09 Received: from localhost (ovpn-116-222.ams2.redhat.com [10.36.116.222]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5B60C7F464; Fri, 30 Jun 2017 13:21:59 +0000 (UTC) From: Stefan Hajnoczi To: linux-nfs@vger.kernel.org Cc: Jeff Layton , Abbas Naderi , Steve Dickson , Stefan Hajnoczi Subject: [PATCH nfs-utils v2 10/12] exportfs: add support for "vsock:" exports(5) syntax Date: Fri, 30 Jun 2017 14:21:18 +0100 Message-Id: <20170630132120.31578-11-stefanha@redhat.com> In-Reply-To: <20170630132120.31578-1-stefanha@redhat.com> References: <20170630132120.31578-1-stefanha@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.28]); Fri, 30 Jun 2017 13:22:00 +0000 (UTC) Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Allow exports to be restricted to AF_VSOCK clients: # exportfs vsock:3:/export and: # cat /etc/exports /export vsock:*(rw,no_root_squash,insecure,subtree_check) Signed-off-by: Stefan Hajnoczi --- utils/exportfs/exportfs.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c index 3ded733..6bf67f1 100644 --- a/utils/exportfs/exportfs.c +++ b/utils/exportfs/exportfs.c @@ -299,6 +299,20 @@ static int exportfs_generic(char *arg, char *options, int verbose) return 0; } +static int exportfs_vsock(char *arg, char *options, int verbose) +{ + char *path; + + if ((path = strchr(arg + strlen("vsock:"), ':')) != NULL) + *path++ = '\0'; + + if (!path || *path != '/') + return 1; + + exportfs_parsed(arg, path, options, verbose); + return 0; +} + static int exportfs_ipv6(char *arg, char *options, int verbose) { char *path, *c; @@ -332,6 +346,8 @@ exportfs(char *arg, char *options, int verbose) if (*arg == '[') failed = exportfs_ipv6(arg, options, verbose); + else if (strncmp(arg, "vsock:", strlen("vsock:")) == 0) + failed = exportfs_vsock(arg, options, verbose); else failed = exportfs_generic(arg, options, verbose); if (failed) @@ -412,6 +428,20 @@ static int unexportfs_generic(char *arg, int verbose) return 0; } +static int unexportfs_vsock(char *arg, int verbose) +{ + char *path; + + if ((path = strchr(arg + strlen("vsock:"), ':')) != NULL) + *path++ = '\0'; + + if (!path || *path != '/') + return 1; + + unexportfs_parsed(arg, path, verbose); + return 0; +} + static int unexportfs_ipv6(char *arg, int verbose) { char *path, *c; @@ -445,6 +475,8 @@ unexportfs(char *arg, int verbose) if (*arg == '[') failed = unexportfs_ipv6(arg, verbose); + else if (strncmp(arg, "vsock:", strlen("vsock:")) == 0) + failed = unexportfs_vsock(arg, verbose); else failed = unexportfs_generic(arg, verbose); if (failed)