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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7EE50C2D0DB for ; Thu, 23 Jan 2020 13:54:22 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 4C7AE20684 for ; Thu, 23 Jan 2020 13:54:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VC9d200g" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4C7AE20684 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:57480 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iucw8-0003Wp-T2 for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 08:54:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:40736) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iub9H-0002dp-Lt for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iub9G-0005KX-Lh for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:47 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:27072 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iub9F-0005Jg-MY for qemu-devel@nongnu.org; Thu, 23 Jan 2020 06:59:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780785; 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=VC9d200g5ph1ogRlgJqQx4OEQoua0LLZzqSSZAyyS7uLA+rZe9cXDbTwZSdXWEI5N59spO 5tPH8g2Po2+DLKIYZK/KPsSEVLV/ZHg6zNlX7t9iWjjOOi578LTiqW0vtpyiKP+vJdWkds GBoxhs48SmW92+dA4UGWY4wmi9HjGrE= 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-414-NuCfHZaJNEe0dxw-6wlhEw-1; Thu, 23 Jan 2020 06:59:43 -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 E2C02DB6A for ; Thu, 23 Jan 2020 11:59:42 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34D4B1CB; Thu, 23 Jan 2020 11:59:42 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 046/111] virtiofsd: prevent ".." escape in lo_do_lookup() Date: Thu, 23 Jan 2020 11:57:36 +0000 Message-Id: <20200123115841.138849-47-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: NuCfHZaJNEe0dxw-6wlhEw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII 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.61 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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