Received: by 2002:a25:1506:0:0:0:0:0 with SMTP id 6csp4289431ybv; Tue, 25 Feb 2020 17:07:57 -0800 (PST) X-Google-Smtp-Source: APXvYqyBwUYBXnSEbHh/amSettGiAULIRf5nC/Ow3VZr64AzEazzRWqcxcvXNLe+Le4jrHQF0nPX X-Received: by 2002:a9d:6a90:: with SMTP id l16mr969531otq.353.1582679277491; Tue, 25 Feb 2020 17:07:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1582679277; cv=none; d=google.com; s=arc-20160816; b=TIv2jPbG7x2HtGB6MVWii0JG+ltMzr1yEAlwBFJF0a2ayoZbtAfeTDd5GAEmG3wSyu JdXzng6oeoFXeUJevMuBs9PyVEavCrbM2Bqa7l6TDBphUgkZsRpURyXjM8CKfpfc5jRl 42pqlpnAw1lo0AFWDrX2sWo1sk7aWv00WXY/1/n7jsrAXuPEsBdd2aVQZfWZGIpnHMwC eJkLzC2PKFrt+gnwY1JZiK/taDneOuLUpFK4iSZWtuVjdAr32DzBIOFHUgWy+WvbD3T3 FkoDabiDrkwY4pLilqzxtRPx4dlPOlATjgPUsPaNSXXZJi5vRvOfF0PBbTOpyMj4BPC+ n/0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=7K8O5rj8zPhErBBHNfgvIpU8NYGxrCf/Q7+Z6081dwQ=; b=EuWIdRkTxUKKwTZRi4Gk8dRvo6ZDEuAGQ9rEKc8C+beJDobhjtJ3StRxMdMa4SOaHY 81CVgbucKYP6cqtb+wWY2tdX0+VVYkkeWINDPCTfENNm9tZL/y7aCSQkWZ3Yc9nh3MoN J3N/eQKrG/615Z9eMUFciBgZHSV1lEPo+8T9JLkqz/o+6jp7v46ykJGIQRwWgAHkEmo4 d/9UhrK3nFnaywnVrRQ11OYyzAGAQVFhJxRsjrpQTC8ZJHuIFPTrsHL8YhRxfCL+voJS EI21XF64+O+n/NLfPqADwu9glO22mqvDqw09ZsH3pul7lkvnGqZcNq+U36VMZEYM1k71 Dxrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=hLOzD9y1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e25si347943otk.62.2020.02.25.17.07.45; Tue, 25 Feb 2020 17:07:57 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=hLOzD9y1; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729441AbgBZBHU (ORCPT + 99 others); Tue, 25 Feb 2020 20:07:20 -0500 Received: from mail-io1-f65.google.com ([209.85.166.65]:44848 "EHLO mail-io1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729170AbgBZBHU (ORCPT ); Tue, 25 Feb 2020 20:07:20 -0500 Received: by mail-io1-f65.google.com with SMTP id z16so1407788iod.11 for ; Tue, 25 Feb 2020 17:07:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=7K8O5rj8zPhErBBHNfgvIpU8NYGxrCf/Q7+Z6081dwQ=; b=hLOzD9y11YkL6FrFfln1tV10PwWGQgWlWWsO7SJwsUNsD1HUbXHdvFHUsyUJxAvFbb yQKCwhuRPMKMIUwknYp6Bw8eKbpawLQ+LwJK+d9DSQVvBwYY0Rkk6VMYsuMN6MisrVIX zQKTnZoed1hD7oPENCTC6nhVg4W4RqRKK0vwk= 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:mime-version :content-transfer-encoding; bh=7K8O5rj8zPhErBBHNfgvIpU8NYGxrCf/Q7+Z6081dwQ=; b=kmLhmzDqqKCaSMHwKdjw8w/F1OyP8WOBd3E85TGADBLtHjKg+El/AVr94ceBYv4T7V noRWj9ePIwXr24Yj2Msqp6STiZEuAgphpZ8INFe0OST/w227cTh3hfKHFkcNF7PV8nKD 4Dt+fUHE2ztFpQZXZ3wF3tud4fpCIlrnNldt/EksW/08U3txL/kRGG4zpi+Y14YTIEQi tR20drp3vtrv1BfW7T7w1QpA0S9w81pXc8hYTinKtIkjSjqk833dVpXyq5QnEJ0XXAQ8 5W461Gd/f1hbOeQuEWGa31adZ1YVqg+Kj0fn3cxJLA7lWSGWWvCREgbPg5j2qFHQNk85 glKw== X-Gm-Message-State: APjAAAV9O5rnXldOMCbf4hnftAHAYB3Qa9KDpC5tswtVznOPYvueTZKv YQT+2ztfk6dKb/RXBlpCzpX1M/kYg1g= X-Received: by 2002:a6b:6108:: with SMTP id v8mr1567540iob.210.1582679238467; Tue, 25 Feb 2020 17:07:18 -0800 (PST) Received: from localhost ([2620:15c:183:200:855f:8919:84a7:4794]) by smtp.gmail.com with ESMTPSA id w15sm159385iow.61.2020.02.25.17.07.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 25 Feb 2020 17:07:17 -0800 (PST) From: Ross Zwisler X-Google-Original-From: Ross Zwisler To: linux-kernel@vger.kernel.org, Alexander Viro , Aleksa Sarai , Andrew Morton Cc: Mattias Nissler , David Howells , Matthew Wilcox , Raul Rangel , linux-fsdevel@vger.kernel.org, Benjamin Gordon , Micah Morton , Dmitry Torokhov , Jan Kara , Ross Zwisler Subject: [PATCH] Add a "nosymfollow" mount option. Date: Tue, 25 Feb 2020 18:07:06 -0700 Message-Id: <20200226010706.9431-1-zwisler@google.com> X-Mailer: git-send-email 2.25.1.481.gfbce0eb801-goog MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mattias Nissler For mounts that have the new "nosymfollow" option, don't follow symlinks when resolving paths. The new option is similar in spirit to the existing "nodev", "noexec", and "nosuid" options, as well as to the LOOKUP_NO_SYMLINKS resolve flag in the openat2(2) syscall. Various BSD variants have been supporting the "nosymfollow" mount option for a long time with equivalent implementations. Note that symlinks may still be created on file systems mounted with the "nosymfollow" option present. readlink() remains functional, so user space code that is aware of symlinks can still choose to follow them explicitly. Setting the "nosymfollow" mount option helps prevent privileged writers from modifying files unintentionally in case there is an unexpected link along the accessed path. The "nosymfollow" option is thus useful as a defensive measure for systems that need to deal with untrusted file systems in privileged contexts. More information on the history and motivation for this patch can be found here: https://sites.google.com/a/chromium.org/dev/chromium-os/chromiumos-design-docs/hardening-against-malicious-stateful-data#TOC-Restricting-symlink-traversal Signed-off-by: Mattias Nissler Signed-off-by: Ross Zwisler --- Changes since v5 [1]: * Redefined MS_NOSYMFOLLOW to use a lower unused bit value (256) so it doesn't collide with MS_SUBMOUNT. * Updated the mount code in util-linux [2] to use the newly defined flag value. * Updated man pages for mount(8) [2], as well as mount(2) and statfs(2) [3]. [1]: https://patchwork.kernel.org/patch/11365291/ [2]: https://github.com/rzwisler/util-linux/commit/7f8771acd85edb70d97921c026c55e1e724d4e15 [3]: https://github.com/rzwisler/man-pages/commit/b8fe8079f64b5068940c0144586e580399a71668 --- fs/namei.c | 3 ++- fs/namespace.c | 2 ++ fs/proc_namespace.c | 1 + fs/statfs.c | 2 ++ include/linux/mount.h | 3 ++- include/linux/statfs.h | 1 + include/uapi/linux/mount.h | 1 + 7 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fs/namei.c b/fs/namei.c index db6565c998259..026a774d28c3d 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -1122,7 +1122,8 @@ const char *get_link(struct nameidata *nd) int error; const char *res; - if (unlikely(nd->flags & LOOKUP_NO_SYMLINKS)) + if (unlikely(nd->flags & LOOKUP_NO_SYMLINKS) || + unlikely(nd->path.mnt->mnt_flags & MNT_NOSYMFOLLOW)) return ERR_PTR(-ELOOP); if (!(nd->flags & LOOKUP_RCU)) { diff --git a/fs/namespace.c b/fs/namespace.c index 85b5f7bea82e7..9b843b66d39e4 100644 --- a/fs/namespace.c +++ b/fs/namespace.c @@ -3074,6 +3074,8 @@ long do_mount(const char *dev_name, const char __user *dir_name, mnt_flags &= ~(MNT_RELATIME | MNT_NOATIME); if (flags & MS_RDONLY) mnt_flags |= MNT_READONLY; + if (flags & MS_NOSYMFOLLOW) + mnt_flags |= MNT_NOSYMFOLLOW; /* The default atime for remount is preservation */ if ((flags & MS_REMOUNT) && diff --git a/fs/proc_namespace.c b/fs/proc_namespace.c index 273ee82d8aa97..91a552f617406 100644 --- a/fs/proc_namespace.c +++ b/fs/proc_namespace.c @@ -70,6 +70,7 @@ static void show_mnt_opts(struct seq_file *m, struct vfsmount *mnt) { MNT_NOATIME, ",noatime" }, { MNT_NODIRATIME, ",nodiratime" }, { MNT_RELATIME, ",relatime" }, + { MNT_NOSYMFOLLOW, ",nosymfollow" }, { 0, NULL } }; const struct proc_fs_info *fs_infop; diff --git a/fs/statfs.c b/fs/statfs.c index 2616424012ea7..59f33752c1311 100644 --- a/fs/statfs.c +++ b/fs/statfs.c @@ -29,6 +29,8 @@ static int flags_by_mnt(int mnt_flags) flags |= ST_NODIRATIME; if (mnt_flags & MNT_RELATIME) flags |= ST_RELATIME; + if (mnt_flags & MNT_NOSYMFOLLOW) + flags |= ST_NOSYMFOLLOW; return flags; } diff --git a/include/linux/mount.h b/include/linux/mount.h index bf8cc4108b8f9..ff2d132c21f5d 100644 --- a/include/linux/mount.h +++ b/include/linux/mount.h @@ -30,6 +30,7 @@ struct fs_context; #define MNT_NODIRATIME 0x10 #define MNT_RELATIME 0x20 #define MNT_READONLY 0x40 /* does the user want this to be r/o? */ +#define MNT_NOSYMFOLLOW 0x80 #define MNT_SHRINKABLE 0x100 #define MNT_WRITE_HOLD 0x200 @@ -46,7 +47,7 @@ struct fs_context; #define MNT_SHARED_MASK (MNT_UNBINDABLE) #define MNT_USER_SETTABLE_MASK (MNT_NOSUID | MNT_NODEV | MNT_NOEXEC \ | MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME \ - | MNT_READONLY) + | MNT_READONLY | MNT_NOSYMFOLLOW) #define MNT_ATIME_MASK (MNT_NOATIME | MNT_NODIRATIME | MNT_RELATIME ) #define MNT_INTERNAL_FLAGS (MNT_SHARED | MNT_WRITE_HOLD | MNT_INTERNAL | \ diff --git a/include/linux/statfs.h b/include/linux/statfs.h index 9bc69edb8f188..fac4356ea1bfc 100644 --- a/include/linux/statfs.h +++ b/include/linux/statfs.h @@ -40,6 +40,7 @@ struct kstatfs { #define ST_NOATIME 0x0400 /* do not update access times */ #define ST_NODIRATIME 0x0800 /* do not update directory access times */ #define ST_RELATIME 0x1000 /* update atime relative to mtime/ctime */ +#define ST_NOSYMFOLLOW 0x2000 /* do not follow symlinks */ struct dentry; extern int vfs_get_fsid(struct dentry *dentry, __kernel_fsid_t *fsid); diff --git a/include/uapi/linux/mount.h b/include/uapi/linux/mount.h index 96a0240f23fed..dd8306ea336c1 100644 --- a/include/uapi/linux/mount.h +++ b/include/uapi/linux/mount.h @@ -16,6 +16,7 @@ #define MS_REMOUNT 32 /* Alter flags of a mounted FS */ #define MS_MANDLOCK 64 /* Allow mandatory locks on an FS */ #define MS_DIRSYNC 128 /* Directory modifications are synchronous */ +#define MS_NOSYMFOLLOW 256 /* Do not follow symlinks */ #define MS_NOATIME 1024 /* Do not update access times. */ #define MS_NODIRATIME 2048 /* Do not update directory access times */ #define MS_BIND 4096 -- 2.25.1.481.gfbce0eb801-goog