From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF866C77B7A for ; Wed, 7 Jun 2023 13:25:07 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6t98-0003uT-Ic; Wed, 07 Jun 2023 09:24:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6t97-0003uL-P5 for qemu-devel@nongnu.org; Wed, 07 Jun 2023 09:24:17 -0400 Received: from smtpout3.mo529.mail-out.ovh.net ([46.105.54.81]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6t95-0001hL-Ak for qemu-devel@nongnu.org; Wed, 07 Jun 2023 09:24:17 -0400 Received: from mxplan5.mail.ovh.net (unknown [10.108.1.149]) by mo529.mail-out.ovh.net (Postfix) with ESMTPS id 3E29920B41; Wed, 7 Jun 2023 13:24:10 +0000 (UTC) Received: from kaod.org (37.59.142.99) by DAG6EX1.mxp5.local (172.16.2.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.23; Wed, 7 Jun 2023 15:24:09 +0200 Authentication-Results: garm.ovh; auth=pass (GARM-99G00399d0b76a-c842-45ff-9b9a-5a92b15c031f, 54EBAD7D0EB3B635C0D3A21D42FFDCE0366FD9B4) smtp.auth=groug@kaod.org X-OVh-ClientIp: 78.197.208.248 Date: Wed, 7 Jun 2023 15:24:06 +0200 From: Greg Kurz To: Christian Schoenebeck CC: , Mauro Matteo Cascella , yw s , , , Subject: Re: [PATCH v2] 9pfs: prevent opening special files (CVE-2023-2861) Message-ID: <20230607151239.22df67b5@bahia> In-Reply-To: <2567904.5Pe2IrQ8Qc@silver> References: <20230606180028.5305af87@bahia> <2567904.5Pe2IrQ8Qc@silver> X-Mailer: Claws Mail 4.1.1 (GTK 3.24.38; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.99] X-ClientProxiedBy: DAG6EX1.mxp5.local (172.16.2.51) To DAG6EX1.mxp5.local (172.16.2.51) X-Ovh-Tracer-GUID: 065ce29e-9bc9-40a3-81c5-fc89e3046952 X-Ovh-Tracer-Id: 9581971157287082345 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -51 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvhedrgedtgedgieegucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnegoufhushhpvggtthffohhmrghinhculdegledmnecujfgurhepfffhvfevuffkjghfofggtgfgihesthejredtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepveeuuddvtedtgefgudetleefiefhjeejhedvfeekgfffuedtudeujeeitdefhfehnecuffhomhgrihhnpehgihhthhhusgdrtghomhdpphhrohhtohgtohhlrdhmugdpghhithhhuhgsrdhiohenucfkphepuddvjedrtddrtddruddpfeejrdehledrudegvddrleelpdejkedrudeljedrvddtkedrvdegkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehgrhhouhhgsehkrghougdrohhrgheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepqhgvmhhupghoshhssegtrhhuuggvsgihthgvrdgtohhmpdhqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgpdhmtggrshgtvghllhesrhgvughhrghtrdgtohhmpdihfihsphhliiesghhmrghilhdrtghomhdpshhhrgifthgrohduuddvheesghhmrghilhdrtghomhdpjhhklhhise igihguihgrnhdrvgguuhdrtghnpdhshhgvnhifvghnsghoseiijhhurdgvughurdgtnhdpoffvtefjohhsthepmhhohedvledpmhhouggvpehsmhhtphhouhht Received-SPF: pass client-ip=46.105.54.81; envelope-from=groug@kaod.org; helo=smtpout3.mo529.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On Wed, 07 Jun 2023 13:02:17 +0200 Christian Schoenebeck wrote: > On Tuesday, June 6, 2023 6:00:28 PM CEST Greg Kurz wrote: > > Hi Christian, > > > > On Tue, 06 Jun 2023 15:57:50 +0200 > > Christian Schoenebeck wrote: > > > > > The 9p protocol does not specifically define how server shall behave when > > > client tries to open a special file, however from security POV it does > > > make sense for 9p server to prohibit opening any special file on host side > > > in general. A sane Linux 9p client for instance would never attempt to > > > open a special file on host side, it would always handle those exclusively > > > on its guest side. A malicious client however could potentially escape > > > from the exported 9p tree by creating and opening a device file on host > > > side. > > > > > > With QEMU this could only be exploited in the following unsafe setups: > > > > > > - Running QEMU binary as root AND 9p 'local' fs driver AND 'passthrough' > > > security model. > > > > > > or > > > > > > - Using 9p 'proxy' fs driver (which is running its helper daemon as > > > root). > > > > > > These setups were already discouraged for safety reasons before, > > > however for obvious reasons we are now tightening behaviour on this. > > > > > > Fixes: CVE-2023-2861 > > > Reported-by: Yanwu Shen > > > Reported-by: Jietao Xiao > > > Reported-by: Jinku Li > > > Reported-by: Wenbo Shen > > > Signed-off-by: Christian Schoenebeck > > > --- > > > v1 -> v2: > > > - Add equivalent fix for 'proxy' fs driver. > > > - Minor adjustments on commit log. > > > > > > > Note that this might be a bit confusing for reviewers since > > v1 was never posted to qemu-devel. Technically, this should > > have been posted without the v2 tag. > > I felt it wouldn't make it any better, as it might otherwise confuse those who > already got the previous two patch emails. > No big deal. > > > fsdev/virtfs-proxy-helper.c | 48 +++++++++++++++++++++++++++++++++++-- > > > hw/9pfs/9p-util.h | 29 ++++++++++++++++++++++ > > > 2 files changed, 75 insertions(+), 2 deletions(-) > > > > > > diff --git a/fsdev/virtfs-proxy-helper.c b/fsdev/virtfs-proxy-helper.c > > > index 5cafcd7703..f311519fa3 100644 > > > --- a/fsdev/virtfs-proxy-helper.c > > > +++ b/fsdev/virtfs-proxy-helper.c > > > @@ -26,6 +26,7 @@ > > > #include "qemu/xattr.h" > > > #include "9p-iov-marshal.h" > > > #include "hw/9pfs/9p-proxy.h" > > > +#include "hw/9pfs/9p-util.h" > > > #include "fsdev/9p-iov-marshal.h" > > > > > > #define PROGNAME "virtfs-proxy-helper" > > > @@ -338,6 +339,49 @@ static void resetugid(int suid, int sgid) > > > } > > > } > > > > > > +/* > > > + * Open regular file or directory. Attempts to open any special file are > > > + * rejected. > > > + * > > > + * returns file descriptor or -1 on error > > > + */ > > > +static int open_regular(const char *pathname, int flags, mode_t mode) { > > > + int fd; > > > + struct stat stbuf; > > > + > > > + fd = open(pathname, flags, mode); > > > + if (fd < 0) { > > > + return fd; > > > + } > > > + > > > + /* CVE-2023-2861: Prohibit opening any special file directly on host > > > + * (especially device files), as a compromised client could potentially > > > + * gain access outside exported tree under certain, unsafe setups. We > > > + * expect client to handle I/O on special files exclusively on guest side. > > > + */ > > > + if (qemu_fstat(fd, &stbuf) < 0) { > > > + close_preserve_errno(fd); > > > + return -1; > > > + } > > > + if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) { > > > + /* Tcreate and Tlcreate 9p messages mandate to immediately open the > > > + * created file for I/O. So this is not (necessarily) due to a broken > > > + * client, and hence no error message is to be reported in this case. > > > + */ > > > + if (!(flags & O_CREAT)) { > > > > Tlcreate is explicitly about creating regular files only (see [1] and > > v9fs_lcreate()) and I don't quite see how open() could successfully > > create a regular file and the resulting fd is fstat'ed as something > > else. > > > > Tcreate seems to cover more types but again only regular files (with O_CREAT) > > or directories (without O_CREAT) are expected here (see v9fs_create()). > > > > Unless I'm missing something, it seems that the comment and the O_CREAT > > check should be removed. > > > > [1] https://github.com/chaos/diod/blob/master/protocol.md#lcreate----create-regular-file > > You are right about Tlcreate, but for Tcreate 9p2000.u specifies, quote: > > "In addition to creating directories with DMDIR, 9P2000.u allows the creation > of symlinks (DMSYMLINK), devices (DMDEVICE), named pipes (DMNAMEPIPE), and > sockets (DMSOCKET)." > > http://ericvh.github.io/9p-rfc/rfc9p2000.u.html#anchor17 > > So I just remove mentioning Tlcreate in the comment? > Well, Tcreate indeed allows to create other file types but in the end the only ones that result in a call to open() are directories and regular files. Regular files are created and open atomically with v9fs_co_open2() just like with Tlcreate. Directories are created with v9fs_co_mkdir() and open with v9fs_co_opendir(), hence two distinct thread-pool jobs. This means that open() isn't passed O_CREAT in this case, but we still have to check since rogue code could have replaced the directory with something else (the current patch wouldn't detect that a directory was replaced with a regular file BTW). > > > > > + error_report_once( > > > + "9p: broken or compromised client detected; attempt to open " > > > + "special file (i.e. neither regular file, nor directory)" > > > + ); > > > + } > > > + close(fd); > > > + errno = ENXIO; > > > + return -1; > > > + } > > > + > > > + return fd; > > > +} > > > + > > > /* > > > * send response in two parts > > > * 1) ProxyHeader > > > @@ -682,7 +726,7 @@ static int do_create(struct iovec *iovec) > > > if (ret < 0) { > > > goto unmarshal_err_out; > > > } > > > - ret = open(path.data, flags, mode); > > > + ret = open_regular(path.data, flags, mode); > > > if (ret < 0) { > > > ret = -errno; > > > } > > > @@ -707,7 +751,7 @@ static int do_open(struct iovec *iovec) > > > if (ret < 0) { > > > goto err_out; > > > } > > > - ret = open(path.data, flags); > > > + ret = open_regular(path.data, flags, 0); > > > if (ret < 0) { > > > ret = -errno; > > > } > > > diff --git a/hw/9pfs/9p-util.h b/hw/9pfs/9p-util.h > > > index c314cf381d..9da1a0538d 100644 > > > --- a/hw/9pfs/9p-util.h > > > +++ b/hw/9pfs/9p-util.h > > > @@ -13,6 +13,8 @@ > > > #ifndef QEMU_9P_UTIL_H > > > #define QEMU_9P_UTIL_H > > > > > > +#include "qemu/error-report.h" > > > + > > > #ifdef O_PATH > > > #define O_PATH_9P_UTIL O_PATH > > > #else > > > @@ -95,6 +97,7 @@ static inline int errno_to_dotl(int err) { > > > #endif > > > > > > #define qemu_openat openat > > > +#define qemu_fstat fstat > > > #define qemu_fstatat fstatat > > > #define qemu_mkdirat mkdirat > > > #define qemu_renameat renameat > > > @@ -118,6 +121,7 @@ static inline int openat_file(int dirfd, const char *name, int flags, > > > mode_t mode) > > > { > > > int fd, serrno, ret; > > > + struct stat stbuf; > > > > > > #ifndef CONFIG_DARWIN > > > again: > > > @@ -142,6 +146,31 @@ again: > > > return -1; > > > } > > > > > > + /* CVE-2023-2861: Prohibit opening any special file directly on host > > > + * (especially device files), as a compromised client could potentially > > > + * gain access outside exported tree under certain, unsafe setups. We > > > + * expect client to handle I/O on special files exclusively on guest side. > > > + */ > > > + if (qemu_fstat(fd, &stbuf) < 0) { > > > + close_preserve_errno(fd); > > > + return -1; > > > + } > > > + if (!S_ISREG(stbuf.st_mode) && !S_ISDIR(stbuf.st_mode)) { > > > + /* Tcreate and Tlcreate 9p messages mandate to immediately open the > > > + * created file for I/O. So this is not (necessarily) due to a broken > > > + * client, and hence no error message is to be reported in this case. > > > + */ > > > > Same remark as with the proxy helper. > > > > If you agree with my suggestions, feel free to add my R-b right away. > > > > Cheers, > > I'll definitely take the time for another (v3) round in this case. Thanks! > > > -- > > Greg > > > > > + if (!(flags & O_CREAT)) { > > > + error_report_once( > > > + "9p: broken or compromised client detected; attempt to open " > > > + "special file (i.e. neither regular file, nor directory)" > > > + ); > > > + } > > > + close(fd); > > > + errno = ENXIO; > > > + return -1; > > > + } > > > + > > > serrno = errno; > > > /* O_NONBLOCK was only needed to open the file. Let's drop it. We don't > > > * do that with O_PATH since fcntl(F_SETFL) isn't supported, and openat() > > > > > > -- Greg