From nobody Mon Feb 9 11:06:30 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579786997; cv=none; d=zohomail.com; s=zohoarc; b=OxP5TZCdx1hhhrqLZUl71exYCS7b/W+ndTDpSVcpGGPem/OBCF+Yrn0Jdt0ax1GYnmEoOn3ofDcQl+MacY2yKJdPxuchBPTtHgDc2/o2Zlx7t8jsoMC4Vtzl9H/iVRHg2lD19eBJAGJAdUyds9HXKxqaX1BvODeO9nEW3wGUkDM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579786997; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=v0Lhh+I0+KtmU0zBtZkPdeAoo7iid017XA4V8Gz/OB8=; b=fub0liA1MQfNWXctz2oF+OfunG2uLfzeQ97tiw9jTBl1UN5ERFEBABVO/9UqbWnVINttLDMh7l7l4dQHG6Wssb99/fhgI87KcCBciij4YrVlKxlWZxsU5W9A1JZIFMe0tAzpdmwr76CFStEowSfLu2AWVg2y/GLHwouJ4SBdFmA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579786997317425.4599177204474; Thu, 23 Jan 2020 05:43:17 -0800 (PST) Received: from localhost ([::1]:57212 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuclP-0005aI-KG for importer@patchew.org; Thu, 23 Jan 2020 08:43:15 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40741) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub9I-0002eI-1M for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iub9G-0005Kq-Tb for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:47 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:52047 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iub9G-0005KG-P6 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:46 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-430-zw_hkazVPAih_EPc4k8Tlw-1; Thu, 23 Jan 2020 06:59:44 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E479210120A7 for ; Thu, 23 Jan 2020 11:59:43 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3C19485750; Thu, 23 Jan 2020 11:59:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780786; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v0Lhh+I0+KtmU0zBtZkPdeAoo7iid017XA4V8Gz/OB8=; b=G17FUay3IsLxuxKhIxQyVFUyZICjwFJ/LNhCkemgtWZKiQ34b3wiuZ6UvOra9N23GTx5Jq dTflijL/xf7HKpAYT02ocCLkW3vLbfnodbM1nV2X76pwQ7h6XnW14Dn679xLx4thQgEzIR F95/F/MT45zBGKwjm5Tb9XfqP1jIpQA= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 047/111] virtiofsd: prevent ".." escape in lo_do_readdir() Date: Thu, 23 Jan 2020 11:57:37 +0000 Message-Id: <20200123115841.138849-48-dgilbert@redhat.com> In-Reply-To: <20200123115841.138849-1-dgilbert@redhat.com> References: <20200123115841.138849-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: zw_hkazVPAih_EPc4k8Tlw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Stefan Hajnoczi Construct a fake dirent for the root directory's ".." entry. This hides the parent directory from the FUSE client. Signed-off-by: Stefan Hajnoczi Reviewed-by: Sergio Lopez Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 36 +++++++++++++++++++------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 79d5966eea..e3d65c3676 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1149,19 +1149,25 @@ out_err: static void lo_do_readdir(fuse_req_t req, fuse_ino_t ino, size_t size, off_t offset, struct fuse_file_info *fi, int plu= s) { + struct lo_data *lo =3D lo_data(req); struct lo_dirp *d; + struct lo_inode *dinode; char *buf =3D NULL; char *p; size_t rem =3D size; - int err =3D ENOMEM; + int err =3D EBADF; =20 - (void)ino; + dinode =3D lo_inode(req, ino); + if (!dinode) { + goto error; + } =20 d =3D lo_dirp(req, fi); if (!d) { goto error; } =20 + err =3D ENOMEM; buf =3D calloc(1, size); if (!buf) { goto error; @@ -1192,15 +1198,21 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_= t ino, size_t size, } nextoff =3D d->entry->d_off; name =3D d->entry->d_name; + fuse_ino_t entry_ino =3D 0; + struct fuse_entry_param e =3D (struct fuse_entry_param){ + .attr.st_ino =3D d->entry->d_ino, + .attr.st_mode =3D d->entry->d_type << 12, + }; + + /* Hide root's parent directory */ + if (dinode =3D=3D &lo->root && strcmp(name, "..") =3D=3D 0) { + e.attr.st_ino =3D lo->root.ino; + e.attr.st_mode =3D DT_DIR << 12; + } + if (plus) { - struct fuse_entry_param e; - if (is_dot_or_dotdot(name)) { - e =3D (struct fuse_entry_param){ - .attr.st_ino =3D d->entry->d_ino, - .attr.st_mode =3D d->entry->d_type << 12, - }; - } else { + if (!is_dot_or_dotdot(name)) { err =3D lo_do_lookup(req, ino, name, &e); if (err) { goto error; @@ -1210,11 +1222,7 @@ static void lo_do_readdir(fuse_req_t req, fuse_ino_t= ino, size_t size, =20 entsize =3D fuse_add_direntry_plus(req, p, rem, name, &e, next= off); } else { - struct stat st =3D { - .st_ino =3D d->entry->d_ino, - .st_mode =3D d->entry->d_type << 12, - }; - entsize =3D fuse_add_direntry(req, p, rem, name, &st, nextoff); + entsize =3D fuse_add_direntry(req, p, rem, name, &e.attr, next= off); } if (entsize > rem) { if (entry_ino !=3D 0) { --=20 2.24.1