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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FAC5C43334 for ; Wed, 15 Jun 2022 19:14:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1358277AbiFOTOm (ORCPT ); Wed, 15 Jun 2022 15:14:42 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48508 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357741AbiFOTOk (ORCPT ); Wed, 15 Jun 2022 15:14:40 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 17772527DE for ; Wed, 15 Jun 2022 12:14:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1655320477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=9kY4TiCxgYzxBld1PG6q/7ba/zS7dIjWln34/k3pGxQ=; b=ZU76iuYb/tpY0sM4X7e6sdog96l05Ex4l/T24DJkZ1+Mah/nYlVfjFBxN1lft9h/wAC+3H aRUIu9nvoyAtr0qT749FqLJF6diUZ1AxUfXeZDcEU3Pz+SE1CUGDCvyTNFOJpH1H91hbuP RWm/p57PgvuhqzuiZeviTsdVwj+/1fU= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-648-nuWWKjxFPbuQgMwDedy4kg-1; Wed, 15 Jun 2022 15:14:34 -0400 X-MC-Unique: nuWWKjxFPbuQgMwDedy4kg-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 2F607185A7B2; Wed, 15 Jun 2022 19:14:34 +0000 (UTC) Received: from horse.redhat.com (unknown [10.22.19.47]) by smtp.corp.redhat.com (Postfix) with ESMTP id 17AA2C28112; Wed, 15 Jun 2022 19:14:34 +0000 (UTC) Received: by horse.redhat.com (Postfix, from userid 10451) id C4D022209F9; Wed, 15 Jun 2022 15:14:33 -0400 (EDT) Date: Wed, 15 Jun 2022 15:14:33 -0400 From: Vivek Goyal To: Xie Yongji Cc: miklos@szeredi.hu, stefanha@redhat.com, zhangjiachen.jaycee@bytedance.com, linux-fsdevel@vger.kernel.org, virtualization@lists.linux-foundation.org Subject: Re: [PATCH v2 2/2] virtiofs: allow skipping abort interface Message-ID: References: <20220615055755.197-1-xieyongji@bytedance.com> <20220615055755.197-3-xieyongji@bytedance.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20220615055755.197-3-xieyongji@bytedance.com> X-Scanned-By: MIMEDefang 2.85 on 10.11.54.8 Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org On Wed, Jun 15, 2022 at 01:57:55PM +0800, Xie Yongji wrote: > Virtio-fs does not support aborting requests which are being > processed. Otherwise, it might trigger UAF since What is full form of UAF? Use after free? Thanks Vivek > virtio_fs_request_complete() doesn't know the requests are > aborted. So let's remove the abort interface. > > Fixes: 15c8e72e88e0 ("fuse: allow skipping control interface and forced unmount") > Signed-off-by: Xie Yongji > --- > fs/fuse/control.c | 4 ++-- > fs/fuse/fuse_i.h | 4 ++++ > fs/fuse/inode.c | 1 + > fs/fuse/virtio_fs.c | 1 + > 4 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/fs/fuse/control.c b/fs/fuse/control.c > index 7cede9a3bc96..d93d8ea3a090 100644 > --- a/fs/fuse/control.c > +++ b/fs/fuse/control.c > @@ -272,8 +272,8 @@ int fuse_ctl_add_conn(struct fuse_conn *fc) > > if (!fuse_ctl_add_dentry(parent, fc, "waiting", S_IFREG | 0400, 1, > NULL, &fuse_ctl_waiting_ops) || > - !fuse_ctl_add_dentry(parent, fc, "abort", S_IFREG | 0200, 1, > - NULL, &fuse_ctl_abort_ops) || > + (!fc->no_abort_control && !fuse_ctl_add_dentry(parent, fc, "abort", > + S_IFREG | 0200, 1, NULL, &fuse_ctl_abort_ops)) || > !fuse_ctl_add_dentry(parent, fc, "max_background", S_IFREG | 0600, > 1, NULL, &fuse_conn_max_background_ops) || > !fuse_ctl_add_dentry(parent, fc, "congestion_threshold", > diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h > index a47f14d0ee3f..e29a4e2f2b35 100644 > --- a/fs/fuse/fuse_i.h > +++ b/fs/fuse/fuse_i.h > @@ -507,6 +507,7 @@ struct fuse_fs_context { > bool default_permissions:1; > bool allow_other:1; > bool destroy:1; > + bool no_abort_control:1; > bool no_force_umount:1; > bool legacy_opts_show:1; > enum fuse_dax_mode dax_mode; > @@ -765,6 +766,9 @@ struct fuse_conn { > /* Delete dentries that have gone stale */ > unsigned int delete_stale:1; > > + /** Do not create abort entry in fusectl fs */ > + unsigned int no_abort_control:1; > + > /** Do not allow MNT_FORCE umount */ > unsigned int no_force_umount:1; > > diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c > index 4059c6898e08..02a16cd35f42 100644 > --- a/fs/fuse/inode.c > +++ b/fs/fuse/inode.c > @@ -1564,6 +1564,7 @@ int fuse_fill_super_common(struct super_block *sb, struct fuse_fs_context *ctx) > fc->legacy_opts_show = ctx->legacy_opts_show; > fc->max_read = max_t(unsigned int, 4096, ctx->max_read); > fc->destroy = ctx->destroy; > + fc->no_abort_control = ctx->no_abort_control; > fc->no_force_umount = ctx->no_force_umount; > > err = -ENOMEM; > diff --git a/fs/fuse/virtio_fs.c b/fs/fuse/virtio_fs.c > index 24bcf4dbca2a..af369bea6dbb 100644 > --- a/fs/fuse/virtio_fs.c > +++ b/fs/fuse/virtio_fs.c > @@ -1287,6 +1287,7 @@ static inline void virtio_fs_ctx_set_defaults(struct fuse_fs_context *ctx) > ctx->max_read = UINT_MAX; > ctx->blksize = 512; > ctx->destroy = true; > + ctx->no_abort_control = true; > ctx->no_force_umount = true; > } > > -- > 2.20.1 >