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 19CADC2D0DB for ; Thu, 23 Jan 2020 14:28:46 +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 D73752077C for ; Thu, 23 Jan 2020 14:28:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="cJCDtKsQ" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D73752077C 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]:58036 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iudTQ-0006AA-EP for qemu-devel@archiver.kernel.org; Thu, 23 Jan 2020 09:28:44 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41612) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iubAc-0004Cn-5Y for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iubAZ-0006VD-8n for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:09 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:47036 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 1iubAZ-0006V7-59 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 07:01:07 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579780866; 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=jpp1hU0u41hPqGsR1wZcmULbA2C0eLL4P2m5Syh+A00=; b=cJCDtKsQfWtyZRc8yvZOdyUtWWihiLYX5nKE3yd7YcQ5DUK+PfmDiUuOL3m46KorQ4D8GL lZBLumYhBglJqH9bYH/Gx0MtLj166ZdlI8rw9WH17oLhjLyoPqfyp0uKFXNy4MPAhvRkro J5ejJsU9Veevr9ayE839Z2bRwoEkw+o= 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-403-yjFUXvulM2Suymc1xLCJxw-1; Thu, 23 Jan 2020 07:01:04 -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 78D35107ACCC for ; Thu, 23 Jan 2020 12:01:03 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.0]) by smtp.corp.redhat.com (Postfix) with ESMTP id B996385754; Thu, 23 Jan 2020 12:01:02 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 095/111] virtiofsd: passthrough_ll: fix refcounting on remove/rename Date: Thu, 23 Jan 2020 11:58:25 +0000 Message-Id: <20200123115841.138849-96-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: yjFUXvulM2Suymc1xLCJxw-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: 207.211.31.81 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: Miklos Szeredi Signed-off-by: Miklos Szeredi Reviewed-by: Misono Tomohiro Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 50 +++++++++++++++++++++++++++++++- 1 file changed, 49 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index c819b5f782..e3a6d6b611 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1140,17 +1140,42 @@ out_err: fuse_reply_err(req, saverr); } =20 +static struct lo_inode *lookup_name(fuse_req_t req, fuse_ino_t parent, + const char *name) +{ + int res; + struct stat attr; + + res =3D fstatat(lo_fd(req, parent), name, &attr, + AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW); + if (res =3D=3D -1) { + return NULL; + } + + return lo_find(lo_data(req), &attr); +} + static void lo_rmdir(fuse_req_t req, fuse_ino_t parent, const char *name) { int res; + struct lo_inode *inode; + struct lo_data *lo =3D lo_data(req); + if (!is_safe_path_component(name)) { fuse_reply_err(req, EINVAL); return; } =20 + inode =3D lookup_name(req, parent, name); + if (!inode) { + fuse_reply_err(req, EIO); + return; + } + res =3D unlinkat(lo_fd(req, parent), name, AT_REMOVEDIR); =20 fuse_reply_err(req, res =3D=3D -1 ? errno : 0); + unref_inode_lolocked(lo, inode, 1); } =20 static void lo_rename(fuse_req_t req, fuse_ino_t parent, const char *name, @@ -1158,12 +1183,23 @@ static void lo_rename(fuse_req_t req, fuse_ino_t pa= rent, const char *name, unsigned int flags) { int res; + struct lo_inode *oldinode; + struct lo_inode *newinode; + struct lo_data *lo =3D lo_data(req); =20 if (!is_safe_path_component(name) || !is_safe_path_component(newname))= { fuse_reply_err(req, EINVAL); return; } =20 + oldinode =3D lookup_name(req, parent, name); + newinode =3D lookup_name(req, newparent, newname); + + if (!oldinode) { + fuse_reply_err(req, EIO); + goto out; + } + if (flags) { #ifndef SYS_renameat2 fuse_reply_err(req, EINVAL); @@ -1176,26 +1212,38 @@ static void lo_rename(fuse_req_t req, fuse_ino_t pa= rent, const char *name, fuse_reply_err(req, res =3D=3D -1 ? errno : 0); } #endif - return; + goto out; } =20 res =3D renameat(lo_fd(req, parent), name, lo_fd(req, newparent), newn= ame); =20 fuse_reply_err(req, res =3D=3D -1 ? errno : 0); +out: + unref_inode_lolocked(lo, oldinode, 1); + unref_inode_lolocked(lo, newinode, 1); } =20 static void lo_unlink(fuse_req_t req, fuse_ino_t parent, const char *name) { int res; + struct lo_inode *inode; + struct lo_data *lo =3D lo_data(req); =20 if (!is_safe_path_component(name)) { fuse_reply_err(req, EINVAL); return; } =20 + inode =3D lookup_name(req, parent, name); + if (!inode) { + fuse_reply_err(req, EIO); + return; + } + res =3D unlinkat(lo_fd(req, parent), name, 0); =20 fuse_reply_err(req, res =3D=3D -1 ? errno : 0); + unref_inode_lolocked(lo, inode, 1); } =20 static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inod= e, --=20 2.24.1