From nobody Fri Oct 3 11:42:42 2025 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=1579805576; cv=none; d=zohomail.com; s=zohoarc; b=k5oV6lmme5xHWsUvG90PuC3Zjk2fbnUQcP3wONh7TSOJhfHQe3UH4FW2heIS5FUgjDR+CDBGdnRNq8nyDiInM9keRYPiK5ri8wZ7tUEKTQ7VIPPFRQuF3U4GDlWNhwt54PNpwoKwSfWQ6CRCIt0+X9dsjVSpB0cAziki2uUoubg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579805576; 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=srgrOmyFieyXx9t0NbqY+EjRMqoi8g4ZeWHCIOGsTbs=; b=J35xNhX64ONJhPEXuJhjdk4tmq7H6ojQoiX4eJuSoNBr4RWuWLkXJxpSn0PZFAg2EUY4eMPzPbP9i+IOV84mRTTzOJFLFnBKW+eAHYrv/FT6+ZzTirwecIHbNM2NyE2lngI6o55G/xfXQM5JegXXjr8mpNMS1nCqR8HOdqstIaA= 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 1579805576519925.5735545355216; Thu, 23 Jan 2020 10:52:56 -0800 (PST) Received: from localhost ([::1]:35116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuhb4-0000mK-TR for importer@patchew.org; Thu, 23 Jan 2020 13:52:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41323) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufdz-00050e-1B for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufdy-0006ZH-2v for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47:46 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:42439 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 1iufdy-0006Z9-0U for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:47: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-237-aHQ11TqjMHSWr5KpJkJKmQ-1; Thu, 23 Jan 2020 11:47:44 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 746601034B22 for ; Thu, 23 Jan 2020 16:47:43 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id C210B28994; Thu, 23 Jan 2020 16:47:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798065; 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=srgrOmyFieyXx9t0NbqY+EjRMqoi8g4ZeWHCIOGsTbs=; b=J+wTER3aXEvUX21OzLqbpDIGVCU50vOCbOoiQ+I37EsR61zVskoOOfku6MEJ2wxVC6xFxB q/TlkiPi/TSsIpS/HHHrqm+d6AvzdjPlZkYfzaOK5z3LFCtxg9+iaG7PRA6GOas17OK0cG JaD6wvMi+k1jJvJAMrCpLbnYhIzJJgY= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 046/108] virtiofsd: prevent ".." escape in lo_do_lookup() Date: Thu, 23 Jan 2020 16:45:28 +0000 Message-Id: <20200123164630.91498-47-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: aHQ11TqjMHSWr5KpJkJKmQ-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: 207.211.31.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 Signed-off-by: Stefan Hajnoczi Reviewed-by: Sergio Lopez Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index e375406160..79d5966eea 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -624,12 +624,17 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t pa= rent, const char *name, int res; int saverr; struct lo_data *lo =3D lo_data(req); - struct lo_inode *inode; + struct lo_inode *inode, *dir =3D lo_inode(req, parent); =20 memset(e, 0, sizeof(*e)); e->attr_timeout =3D lo->timeout; e->entry_timeout =3D lo->timeout; =20 + /* Do not allow escaping root directory */ + if (dir =3D=3D &lo->root && strcmp(name, "..") =3D=3D 0) { + name =3D "."; + } + newfd =3D openat(lo_fd(req, parent), name, O_PATH | O_NOFOLLOW); if (newfd =3D=3D -1) { goto out_err; --=20 2.24.1