From patchwork Thu Jan 23 16:46:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Dr. David Alan Gilbert" X-Patchwork-Id: 1228518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=KbmdtIgo; dkim-atps=neutral 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 ozlabs.org (Postfix) with ESMTPS id 483Xjw6BQvz9s1x for ; Fri, 24 Jan 2020 06:42:44 +1100 (AEDT) Received: from localhost ([::1]:60404 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuiNG-0002Ss-SW for incoming@patchwork.ozlabs.org; Thu, 23 Jan 2020 14:42:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42503) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufes-000632-9l for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufer-0008TA-5H for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:42 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:52898 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 1iufer-0008SR-2a for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:41 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798120; 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=KbmdtIgoTbI3cQ566wXAZePeZezqk1sDT04EBMdvToVOYtWUOxpZ0YKp5cPu1ghLhcKuN2 eZa++B2ECTts16QYDf3nk5kNS1Dv0FJcFWi4H5GpcvS0BHValjtz6CtXiCsSERtrQeuhA3 GOahxOL5Vcm3MMShy/G3b9OAXN6PjKc= 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-117-t0koegi6N5WBOas7MDQKwQ-1; Thu, 23 Jan 2020 11:48:38 -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 EACA092786 for ; Thu, 23 Jan 2020 16:48:37 +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 42F6A19C69; Thu, 23 Jan 2020 16:48:37 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 092/108] virtiofsd: passthrough_ll: fix refcounting on remove/rename Date: Thu, 23 Jan 2020 16:46:14 +0000 Message-Id: <20200123164630.91498-93-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: t0koegi6N5WBOas7MDQKwQ-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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+incoming=patchwork.ozlabs.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); } +static struct lo_inode *lookup_name(fuse_req_t req, fuse_ino_t parent, + const char *name) +{ + int res; + struct stat attr; + + res = fstatat(lo_fd(req, parent), name, &attr, + AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW); + if (res == -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 = lo_data(req); + if (!is_safe_path_component(name)) { fuse_reply_err(req, EINVAL); return; } + inode = lookup_name(req, parent, name); + if (!inode) { + fuse_reply_err(req, EIO); + return; + } + res = unlinkat(lo_fd(req, parent), name, AT_REMOVEDIR); fuse_reply_err(req, res == -1 ? errno : 0); + unref_inode_lolocked(lo, inode, 1); } 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 parent, const char *name, unsigned int flags) { int res; + struct lo_inode *oldinode; + struct lo_inode *newinode; + struct lo_data *lo = lo_data(req); if (!is_safe_path_component(name) || !is_safe_path_component(newname)) { fuse_reply_err(req, EINVAL); return; } + oldinode = lookup_name(req, parent, name); + newinode = 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 parent, const char *name, fuse_reply_err(req, res == -1 ? errno : 0); } #endif - return; + goto out; } res = renameat(lo_fd(req, parent), name, lo_fd(req, newparent), newname); fuse_reply_err(req, res == -1 ? errno : 0); +out: + unref_inode_lolocked(lo, oldinode, 1); + unref_inode_lolocked(lo, newinode, 1); } 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 = lo_data(req); if (!is_safe_path_component(name)) { fuse_reply_err(req, EINVAL); return; } + inode = lookup_name(req, parent, name); + if (!inode) { + fuse_reply_err(req, EIO); + return; + } + res = unlinkat(lo_fd(req, parent), name, 0); fuse_reply_err(req, res == -1 ? errno : 0); + unref_inode_lolocked(lo, inode, 1); } static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode,