From patchwork Fri Sep 6 14:34:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mikhalitsyn X-Patchwork-Id: 13794265 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B88011D0140 for ; Fri, 6 Sep 2024 14:35:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725633311; cv=none; b=oY0fThJaguNF4lnKgCha5QKVcNRA1sO7a76d5ikzekqjMA7aKaIaxe7LLzCz2pcw30WWysIf7hgzIAy3//tf2Fz9ovthp+SNfe/tVyr4LuL8jeQCgR6llNuhn/zsIrjwtdf+8V7rKL93RY/Kdi+SLdPewnlYnsEoaDzXuK2eDM8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725633311; c=relaxed/simple; bh=pVyeI53BAtbh5enSOiGTuRtOeJujA6YmS7qvQrPKloA=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=q5Gf5bZUvmNUpxfUaqtdRjUnzMFMB57tfUvUlD6DRkcEzvi1BVE9MayvwatjOMg+3z54IxoSpnsQa/cmIxFkOctp7seVKnuis2/tS9nAJF8//5O4ZeycLKZIaRJjpXLZKuGl6MRSckcXv68ImoxFWLiLCD/wEJQyWZsKsKOAoLQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=GA14clMT; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="GA14clMT" Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 0908D3F45F for ; Fri, 6 Sep 2024 14:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1725633305; bh=o9Smb8VRV1ALrUS2xWCuzXJx0BOoYi7JpBVsIPpJlNY=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=GA14clMT+5pGQHTHXuy2hUkqCAVP++RW04Ps8eYfNocJ+iIESj193x5JC+VycANw5 3tMnrfHpB003s8GgW5pFOV0Cmp0nAtN4bYDxfRmgtwDeP+Im2r3liqW0AyqDM+MJgX eD1xBJLxmuqeQn4qECWGZFASBAa0mBcAXxeccjoqgG1WjBerbn8/qHn23DrpP/Rxd8 lBUICiNpQWJR7yHFn4JHGrFMEom9B2ntzsUOIFSSeiebWPW7+QoV1yEqAG+gFcCg0N dG/NxO+WeeQVmWSpZMsH/Ha9VsIDnnc22V4KmWNYtInIeG2X3Wq/p0MRBokG4vok58 hvxfIuddh2cYg== Received: by mail-ej1-f72.google.com with SMTP id a640c23a62f3a-a8a6fee3ab1so189465066b.3 for ; Fri, 06 Sep 2024 07:35:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725633304; x=1726238104; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o9Smb8VRV1ALrUS2xWCuzXJx0BOoYi7JpBVsIPpJlNY=; b=MutlW2JPOeS8tyadeQ95T3b6us4RLZa/JCSQjmKQS0qjzECZZXKCb9+MJC8eYtWWE5 TMaecIFXgdosTBsj/mQjPulaDUuGopbiVHnlFgU3lpgjtGssqBeDg9Lv/z21rnpSg70U uX/miNKOZXNA6PqwMsqM+PVr3MMKToqEmpAU/PgXwMV+ChGDS2dJdcQcugNLS6hmPUPg pqwSgeaZYsDJL0L/aFz2ghjc3XFhbRoNVaD0yqgTvTpn7xrqPI87qjuZRBpmGqcRXYNI cYP6t9tuUYFwu/f265MEZgJp1Ju/yv3u7Wa2mp7HtvjxWxkXErxPNcR8J6FGCWx+5nLN Hvag== X-Forwarded-Encrypted: i=1; AJvYcCXOFHwimgVBfLM2XVIhvkbVFUGzEXR/6kzHtCz7otUs/LKR7kkmNDmdoUljV2oGq7yhLw1BOteUGa/tn1b4@vger.kernel.org X-Gm-Message-State: AOJu0YwBuu3yFgFXTXKhpDGJCnLZ2QhG2uJIY28ArKM2MAYFxV3D9/gH Y/WR4Ub60nD4lVHxUVfo1P3hytbuzvrv9WDt6QfHi+1/YeNeINcuYNvAQycBGlUeGoMriInqSe4 feAg3FZjKA7O0ao6iyOTdP75UoBzmG2uKv7zOSzZ6P/nciroy9+7RLrop88ZLmiomQUqtUtql2o jOhW0= X-Received: by 2002:a17:907:7ea1:b0:a8b:6ee7:ba2c with SMTP id a640c23a62f3a-a8b70ee9409mr95232466b.16.1725633303897; Fri, 06 Sep 2024 07:35:03 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHq+QzPT0AotRdUG7m3aR9DwpSnlsT/1bn2AVIT0R1FNm00fG4lHyE7UR/ERIjg3FcMUZEWlQ== X-Received: by 2002:a17:907:7ea1:b0:a8b:6ee7:ba2c with SMTP id a640c23a62f3a-a8b70ee9409mr95230666b.16.1725633303290; Fri, 06 Sep 2024 07:35:03 -0700 (PDT) Received: from amikhalitsyn.. ([188.192.113.77]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236cee0sm281787466b.101.2024.09.06.07.35.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 07:35:02 -0700 (PDT) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, linux-fsdevel@vger.kernel.org, Alexander Mikhalitsyn , Miklos Szeredi , linux-kernel@vger.kernel.org Subject: [PATCH v1 1/3] fs/fuse: introduce and use fuse_simple_idmap_request() helper Date: Fri, 6 Sep 2024 16:34:51 +0200 Message-Id: <20240906143453.179506-1-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Let's convert all existing callers properly. No functional changes intended. Suggested-by: Christian Brauner Signed-off-by: Alexander Mikhalitsyn Reviewed-by: Christian Brauner --- fs/fuse/dax.c | 4 ++-- fs/fuse/dev.c | 6 +++--- fs/fuse/dir.c | 26 +++++++++++++------------- fs/fuse/file.c | 32 ++++++++++++++++---------------- fs/fuse/fuse_i.h | 18 ++++++++++++++++-- fs/fuse/inode.c | 6 +++--- fs/fuse/ioctl.c | 2 +- fs/fuse/readdir.c | 4 ++-- fs/fuse/xattr.c | 8 ++++---- 9 files changed, 60 insertions(+), 46 deletions(-) diff --git a/fs/fuse/dax.c b/fs/fuse/dax.c index 6d8368d66dd4..12ef91d170bb 100644 --- a/fs/fuse/dax.c +++ b/fs/fuse/dax.c @@ -207,7 +207,7 @@ static int fuse_setup_one_mapping(struct inode *inode, unsigned long start_idx, args.in_numargs = 1; args.in_args[0].size = sizeof(inarg); args.in_args[0].value = &inarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err < 0) return err; dmap->writable = writable; @@ -245,7 +245,7 @@ static int fuse_send_removemapping(struct inode *inode, args.in_args[0].value = inargp; args.in_args[1].size = inargp->count * sizeof(*remove_one); args.in_args[1].value = remove_one; - return fuse_simple_request(NULL, fm, &args); + return fuse_simple_request(fm, &args); } static int dmap_removemapping_list(struct inode *inode, unsigned int num, diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 5ca2ab48527e..04a6490a587c 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -539,9 +539,9 @@ static void fuse_args_to_req(struct fuse_req *req, struct fuse_args *args) __set_bit(FR_ASYNC, &req->flags); } -ssize_t fuse_simple_request(struct mnt_idmap *idmap, - struct fuse_mount *fm, - struct fuse_args *args) +ssize_t __fuse_simple_request(struct mnt_idmap *idmap, + struct fuse_mount *fm, + struct fuse_args *args) { struct fuse_conn *fc = fm->fc; struct fuse_req *req; diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 99f9948bf68b..491e112819be 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -230,7 +230,7 @@ static int fuse_dentry_revalidate(struct dentry *entry, unsigned int flags) parent = dget_parent(entry); fuse_lookup_init(fm->fc, &args, get_node_id(d_inode(parent)), &entry->d_name, &outarg); - ret = fuse_simple_request(NULL, fm, &args); + ret = fuse_simple_request(fm, &args); dput(parent); /* Zero nodeid is same as -ENOENT */ if (!ret && !outarg.nodeid) @@ -383,7 +383,7 @@ int fuse_lookup_name(struct super_block *sb, u64 nodeid, const struct qstr *name attr_version = fuse_get_attr_version(fm->fc); fuse_lookup_init(fm->fc, &args, nodeid, name, outarg); - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); /* Zero nodeid is same as -ENOENT, but with valid timeout */ if (err || !outarg->nodeid) goto out_put_forget; @@ -677,7 +677,7 @@ static int fuse_create_open(struct mnt_idmap *idmap, struct inode *dir, if (err) goto out_free_ff; - err = fuse_simple_request(idmap, fm, &args); + err = fuse_simple_idmap_request(idmap, fm, &args); free_ext_value(&args); if (err) goto out_free_ff; @@ -809,7 +809,7 @@ static int create_new_entry(struct mnt_idmap *idmap, struct fuse_mount *fm, goto out_put_forget_req; } - err = fuse_simple_request(idmap, fm, args); + err = fuse_simple_idmap_request(idmap, fm, args); free_ext_value(args); if (err) goto out_put_forget_req; @@ -994,7 +994,7 @@ static int fuse_unlink(struct inode *dir, struct dentry *entry) args.in_numargs = 1; args.in_args[0].size = entry->d_name.len + 1; args.in_args[0].value = entry->d_name.name; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (!err) { fuse_dir_changed(dir); fuse_entry_unlinked(entry); @@ -1017,7 +1017,7 @@ static int fuse_rmdir(struct inode *dir, struct dentry *entry) args.in_numargs = 1; args.in_args[0].size = entry->d_name.len + 1; args.in_args[0].value = entry->d_name.name; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (!err) { fuse_dir_changed(dir); fuse_entry_unlinked(entry); @@ -1047,7 +1047,7 @@ static int fuse_rename_common(struct mnt_idmap *idmap, struct inode *olddir, str args.in_args[1].value = oldent->d_name.name; args.in_args[2].size = newent->d_name.len + 1; args.in_args[2].value = newent->d_name.name; - err = fuse_simple_request(idmap, fm, &args); + err = fuse_simple_idmap_request(idmap, fm, &args); if (!err) { /* ctime changes */ fuse_update_ctime(d_inode(oldent)); @@ -1222,7 +1222,7 @@ static int fuse_do_statx(struct mnt_idmap *idmap, struct inode *inode, args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err) return err; @@ -1280,7 +1280,7 @@ static int fuse_do_getattr(struct mnt_idmap *idmap, struct inode *inode, args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (!err) { if (fuse_invalid_attr(&outarg.attr) || inode_wrong_type(inode, outarg.attr.mode)) { @@ -1492,7 +1492,7 @@ static int fuse_access(struct inode *inode, int mask) args.in_numargs = 1; args.in_args[0].size = sizeof(inarg); args.in_args[0].value = &inarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fm->fc->no_access = 1; err = 0; @@ -1604,7 +1604,7 @@ static int fuse_readlink_page(struct inode *inode, struct page *page) ap.args.page_zeroing = true; ap.args.out_numargs = 1; ap.args.out_args[0].size = desc.length; - res = fuse_simple_request(NULL, fm, &ap.args); + res = fuse_simple_request(fm, &ap.args); fuse_invalidate_atime(inode); @@ -1889,7 +1889,7 @@ int fuse_flush_times(struct inode *inode, struct fuse_file *ff) } fuse_setattr_fill(fm->fc, &args, inode, &inarg, &outarg); - return fuse_simple_request(NULL, fm, &args); + return fuse_simple_request(fm, &args); } /* @@ -2002,7 +2002,7 @@ int fuse_do_setattr(struct mnt_idmap *idmap, struct dentry *dentry, inarg.valid |= FATTR_KILL_SUIDGID; } fuse_setattr_fill(fc, &args, inode, &inarg, &outarg); - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err) { if (err == -EINTR) fuse_invalidate_attr(inode); diff --git a/fs/fuse/file.c b/fs/fuse/file.c index ca553d7a7c9e..b8afeca12487 100644 --- a/fs/fuse/file.c +++ b/fs/fuse/file.c @@ -48,7 +48,7 @@ static int fuse_send_open(struct fuse_mount *fm, u64 nodeid, args.out_args[0].size = sizeof(*outargp); args.out_args[0].value = outargp; - return fuse_simple_request(NULL, fm, &args); + return fuse_simple_request(fm, &args); } struct fuse_file *fuse_file_alloc(struct fuse_mount *fm, bool release) @@ -111,7 +111,7 @@ static void fuse_file_put(struct fuse_file *ff, bool sync) if (!args) { /* Do nothing when server does not implement 'open' */ } else if (sync) { - fuse_simple_request(NULL, ff->fm, args); + fuse_simple_request(ff->fm, args); fuse_release_end(ff->fm, args, 0); } else { args->end = fuse_release_end; @@ -539,7 +539,7 @@ static int fuse_flush(struct file *file, fl_owner_t id) args.in_args[0].value = &inarg; args.force = true; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fm->fc->no_flush = 1; err = 0; @@ -572,7 +572,7 @@ int fuse_fsync_common(struct file *file, loff_t start, loff_t end, args.in_numargs = 1; args.in_args[0].size = sizeof(inarg); args.in_args[0].value = &inarg; - return fuse_simple_request(NULL, fm, &args); + return fuse_simple_request(fm, &args); } static int fuse_fsync(struct file *file, loff_t start, loff_t end, @@ -814,7 +814,7 @@ static ssize_t fuse_send_read(struct fuse_io_args *ia, loff_t pos, size_t count, if (ia->io->async) return fuse_async_req_send(fm, ia, count); - return fuse_simple_request(NULL, fm, &ia->ap.args); + return fuse_simple_request(fm, &ia->ap.args); } static void fuse_read_update_size(struct inode *inode, loff_t size, @@ -878,7 +878,7 @@ static int fuse_do_readpage(struct file *file, struct page *page) desc.length--; fuse_read_args_fill(&ia, file, pos, desc.length, FUSE_READ); - res = fuse_simple_request(NULL, fm, &ia.ap.args); + res = fuse_simple_request(fm, &ia.ap.args); if (res < 0) return res; /* @@ -976,7 +976,7 @@ static void fuse_send_readpages(struct fuse_io_args *ia, struct file *file) if (!err) return; } else { - res = fuse_simple_request(NULL, fm, &ap->args); + res = fuse_simple_request(fm, &ap->args); err = res < 0 ? res : 0; } fuse_readpages_end(fm, &ap->args, err); @@ -1101,7 +1101,7 @@ static ssize_t fuse_send_write(struct fuse_io_args *ia, loff_t pos, if (ia->io->async) return fuse_async_req_send(fm, ia, count); - err = fuse_simple_request(NULL, fm, &ia->ap.args); + err = fuse_simple_request(fm, &ia->ap.args); if (!err && ia->write.out.size > count) err = -EIO; @@ -1147,7 +1147,7 @@ static ssize_t fuse_send_write_pages(struct fuse_io_args *ia, if (fm->fc->handle_killpriv_v2 && !capable(CAP_FSETID)) ia->write.in.write_flags |= FUSE_WRITE_KILL_SUIDGID; - err = fuse_simple_request(NULL, fm, &ap->args); + err = fuse_simple_request(fm, &ap->args); if (!err && ia->write.out.size > count) err = -EIO; @@ -2662,7 +2662,7 @@ static int fuse_getlk(struct file *file, struct file_lock *fl) args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (!err) err = convert_fuse_file_lock(fm->fc, &outarg.lk, fl); @@ -2686,7 +2686,7 @@ static int fuse_setlk(struct file *file, struct file_lock *fl, int flock) } fuse_lk_fill(&args, file, fl, opcode, pid_nr, flock, &inarg); - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); /* locking is restartable */ if (err == -EINTR) @@ -2760,7 +2760,7 @@ static sector_t fuse_bmap(struct address_space *mapping, sector_t block) args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) fm->fc->no_bmap = 1; @@ -2792,7 +2792,7 @@ static loff_t fuse_lseek(struct file *file, loff_t offset, int whence) args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err) { if (err == -ENOSYS) { fm->fc->no_lseek = 1; @@ -2925,7 +2925,7 @@ __poll_t fuse_file_poll(struct file *file, poll_table *wait) args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (!err) return demangle_poll(outarg.revents); @@ -3147,7 +3147,7 @@ static long fuse_file_fallocate(struct file *file, int mode, loff_t offset, args.in_numargs = 1; args.in_args[0].size = sizeof(inarg); args.in_args[0].value = &inarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fm->fc->no_fallocate = 1; err = -EOPNOTSUPP; @@ -3259,7 +3259,7 @@ static ssize_t __fuse_copy_file_range(struct file *file_in, loff_t pos_in, args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fc->no_copy_file_range = 1; err = -EOPNOTSUPP; diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 7dd0661aeab6..b2c7834f21b5 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1147,8 +1147,22 @@ void __exit fuse_ctl_cleanup(void); /** * Simple request sending that does request allocation and freeing */ -ssize_t fuse_simple_request(struct mnt_idmap *idmap, struct fuse_mount *fm, - struct fuse_args *args); +ssize_t __fuse_simple_request(struct mnt_idmap *idmap, + struct fuse_mount *fm, + struct fuse_args *args); + +static inline ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args) +{ + return __fuse_simple_request(NULL, fm, args); +} + +static inline ssize_t fuse_simple_idmap_request(struct mnt_idmap *idmap, + struct fuse_mount *fm, + struct fuse_args *args) +{ + return __fuse_simple_request(idmap, fm, args); +} + int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args, gfp_t gfp_flags); diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index d7edb3fb829f..fd3321e29a3e 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -586,7 +586,7 @@ static void fuse_send_destroy(struct fuse_mount *fm) args.opcode = FUSE_DESTROY; args.force = true; args.nocreds = true; - fuse_simple_request(NULL, fm, &args); + fuse_simple_request(fm, &args); } } @@ -624,7 +624,7 @@ static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf) args.out_numargs = 1; args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (!err) convert_fuse_statfs(buf, &outarg.st); return err; @@ -713,7 +713,7 @@ static int fuse_sync_fs(struct super_block *sb, int wait) args.nodeid = get_node_id(sb->s_root->d_inode); args.out_numargs = 0; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fc->sync_fs = 0; err = 0; diff --git a/fs/fuse/ioctl.c b/fs/fuse/ioctl.c index b40dd931167d..572ce8a82ceb 100644 --- a/fs/fuse/ioctl.c +++ b/fs/fuse/ioctl.c @@ -18,7 +18,7 @@ static ssize_t fuse_send_ioctl(struct fuse_mount *fm, struct fuse_args *args, args->out_args[0].size = sizeof(*outarg); args->out_args[0].value = outarg; - ret = fuse_simple_request(NULL, fm, args); + ret = fuse_simple_request(fm, args); /* Translate ENOSYS, which shouldn't be returned from fs */ if (ret == -ENOSYS) diff --git a/fs/fuse/readdir.c b/fs/fuse/readdir.c index e8a093289421..0377b6dc24c8 100644 --- a/fs/fuse/readdir.c +++ b/fs/fuse/readdir.c @@ -279,7 +279,7 @@ static void fuse_force_forget(struct file *file, u64 nodeid) args.force = true; args.noreply = true; - fuse_simple_request(NULL, fm, &args); + fuse_simple_request(fm, &args); /* ignore errors */ } @@ -358,7 +358,7 @@ static int fuse_readdir_uncached(struct file *file, struct dir_context *ctx) FUSE_READDIR); } locked = fuse_lock_inode(inode); - res = fuse_simple_request(NULL, fm, &ap->args); + res = fuse_simple_request(fm, &ap->args); fuse_unlock_inode(inode, locked); if (res >= 0) { if (!res) { diff --git a/fs/fuse/xattr.c b/fs/fuse/xattr.c index 0a9b60de3668..9f568d345c51 100644 --- a/fs/fuse/xattr.c +++ b/fs/fuse/xattr.c @@ -37,7 +37,7 @@ int fuse_setxattr(struct inode *inode, const char *name, const void *value, args.in_args[1].value = name; args.in_args[2].size = size; args.in_args[2].value = value; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fm->fc->no_setxattr = 1; err = -EOPNOTSUPP; @@ -79,7 +79,7 @@ ssize_t fuse_getxattr(struct inode *inode, const char *name, void *value, args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; } - ret = fuse_simple_request(NULL, fm, &args); + ret = fuse_simple_request(fm, &args); if (!ret && !size) ret = min_t(size_t, outarg.size, XATTR_SIZE_MAX); if (ret == -ENOSYS) { @@ -141,7 +141,7 @@ ssize_t fuse_listxattr(struct dentry *entry, char *list, size_t size) args.out_args[0].size = sizeof(outarg); args.out_args[0].value = &outarg; } - ret = fuse_simple_request(NULL, fm, &args); + ret = fuse_simple_request(fm, &args); if (!ret && !size) ret = min_t(size_t, outarg.size, XATTR_LIST_MAX); if (ret > 0 && size) @@ -167,7 +167,7 @@ int fuse_removexattr(struct inode *inode, const char *name) args.in_numargs = 1; args.in_args[0].size = strlen(name) + 1; args.in_args[0].value = name; - err = fuse_simple_request(NULL, fm, &args); + err = fuse_simple_request(fm, &args); if (err == -ENOSYS) { fm->fc->no_removexattr = 1; err = -EOPNOTSUPP; From patchwork Fri Sep 6 14:34:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mikhalitsyn X-Patchwork-Id: 13794264 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B13291D1741 for ; Fri, 6 Sep 2024 14:35:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725633311; cv=none; b=PozS6/9oeAcPflkRJOprBNdyiE5mTuW1YYHBk7+RNNfESVwd0lThHvgVP3lYcrZdKa0qw7Cn1Io7E1DECCWqK65WJ/s7Ijg2M22THEnrcTCqZUlf5Rsy6gg6M+vx3U+U/3rx6J0nRwtfwoX82dRhDwD4lgOdDZGusKctY56q9xs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725633311; c=relaxed/simple; bh=vRdXR+Ob0mnRFvuQCd+W3NEcC2Rb5RFsu+cBKmNqVa8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=H8vQNlkDopVZBEC3IYqViUmvahPrhtYUq5KL/c2QN2+4YepRDaRa7ssa25CJENl0qCyazNl0X+cq4adIBpmlYBe+abXPgCTd3Eo59SqfFuTStx0qhxFq90J/VXiF3UhYyC3zvo47wHOTRAY9XoY3Zqq7GUHUESumSidmmV51zNo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=NZOkkI0v; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="NZOkkI0v" Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 1BDB83F5B7 for ; Fri, 6 Sep 2024 14:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1725633307; bh=vVAyedH9CSkJs+YjMx3elnJrl6De9lkV+SRi3m1K9lQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NZOkkI0vlcwsIU0oIdCui1+3H5sq/AL0AbNjfUkMLEvyj/NfHbjpVZM4/oavxpB3h HIaJz9XacJ7NRs4f6F7hdpnhGH+G7cKrFdsDQIjTDMPlnNOkjq6akRvbVcl+/LF9rX dpNA4F7vRyMh9crZMrPFoP8F2RwFJOylq1cHj8wXGXQgs3LccHZaGHEIYsGxA9/Dd2 6W1PmgCvDiiiwMLDzTgX7sD5SzIejOQ/ivIZLxNK1wsJVlaPwg4mEsYkMnuuGaAqNs 8HKv21AlBaPkSeMxwI4LgQVZvHiiWB6rffhQGHiRNUelH+szze2IZppOmlW+eXvEe0 v0flbxv2oGBeg== Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-a8d1095442cso10470066b.3 for ; Fri, 06 Sep 2024 07:35:07 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725633306; x=1726238106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vVAyedH9CSkJs+YjMx3elnJrl6De9lkV+SRi3m1K9lQ=; b=leqW/9sZ+q10xE+XnG+JKN1ucCAVWob1ZUawQA9pTPf+15PgynCc+P6ZHjsmFI4fMZ t1e1/bw/MhtpZ78mkFJl/q/CkkrOtQSYyKHO8N6+T79XxcLQh/zwucAW39baP19qCrSg hC1kiNyWgHO81ffx/pRP6X9ns3fgefw+MDPfb7sRuLUXKhiVEUgfg0mTHQmYDpj6TNB/ ZyFHDIYg0GI+OL6egj4MGrnr/BsXfCMUBubS7tnbDeaUZ4HdNkgXWCVfsKwUm60yvKxn V0lBlxb7HXLZjPDlMxyRjvan7actBDLeO30N40orbyXqA2l1I4nTQ23Mn/dIziWheZcL Mq4w== X-Forwarded-Encrypted: i=1; AJvYcCUp+8/16Xonj3K7ZSgE4g+BG8q6I+mATdw6/vjubsiD9aJKeoqqMOKFAndysXv+talgTLNDIIdiGDqd6jtu@vger.kernel.org X-Gm-Message-State: AOJu0Yx30nfoOvr6ONMK5Igh1BMcf7SXAzm6bhAvLUxXLOlc8rE/9JXO LV296BsVZYSQv72uiKKfWTm6hkbnvunWXmJsaArHrc7aA+IWV4BYyaRR5B4IFJQDUkN3rEbwcdy 5ChZcSxVX9T/2BB3KXnXcG28WzOUcfQIKfVBC2pYi8E5PCIuCe+c032nWmGIooyF7bOCkRgbL2/ 8kRmE= X-Received: by 2002:a17:907:96a1:b0:a86:a7ef:5c9e with SMTP id a640c23a62f3a-a8a888d048fmr180478166b.59.1725633306341; Fri, 06 Sep 2024 07:35:06 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFaDCxVgARkRpUsjaX0FAJO6glT8Qcp5RWHWQTtwxvVEnZ+tv3NLGsJxlxsKS0polGzAPOuOA== X-Received: by 2002:a17:907:96a1:b0:a86:a7ef:5c9e with SMTP id a640c23a62f3a-a8a888d048fmr180476966b.59.1725633305874; Fri, 06 Sep 2024 07:35:05 -0700 (PDT) Received: from amikhalitsyn.. ([188.192.113.77]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236cee0sm281787466b.101.2024.09.06.07.35.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 07:35:05 -0700 (PDT) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, linux-fsdevel@vger.kernel.org, Alexander Mikhalitsyn , Miklos Szeredi , Alexander Viro , Jan Kara , Seth Forshee , linux-kernel@vger.kernel.org Subject: [PATCH v1 2/3] fs/mnt_idmapping: introduce an invalid_mnt_idmap Date: Fri, 6 Sep 2024 16:34:52 +0200 Message-Id: <20240906143453.179506-2-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906143453.179506-1-aleksandr.mikhalitsyn@canonical.com> References: <20240906143453.179506-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Link: https://lore.kernel.org/linux-fsdevel/20240904-baugrube-erhoben-b3c1c49a2645@brauner/ Suggested-by: Christian Brauner Signed-off-by: Alexander Mikhalitsyn Reviewed-by: Christian Brauner --- fs/mnt_idmapping.c | 22 ++++++++++++++++++++-- include/linux/mnt_idmapping.h | 1 + 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/fs/mnt_idmapping.c b/fs/mnt_idmapping.c index 3c60f1eaca61..cbca6500848e 100644 --- a/fs/mnt_idmapping.c +++ b/fs/mnt_idmapping.c @@ -32,6 +32,15 @@ struct mnt_idmap nop_mnt_idmap = { }; EXPORT_SYMBOL_GPL(nop_mnt_idmap); +/* + * Carries the invalid idmapping of a full 0-4294967295 {g,u}id range. + * This means that all {g,u}ids are mapped to INVALID_VFS{G,U}ID. + */ +struct mnt_idmap invalid_mnt_idmap = { + .count = REFCOUNT_INIT(1), +}; +EXPORT_SYMBOL_GPL(invalid_mnt_idmap); + /** * initial_idmapping - check whether this is the initial mapping * @ns: idmapping to check @@ -75,6 +84,8 @@ vfsuid_t make_vfsuid(struct mnt_idmap *idmap, if (idmap == &nop_mnt_idmap) return VFSUIDT_INIT(kuid); + if (idmap == &invalid_mnt_idmap) + return INVALID_VFSUID; if (initial_idmapping(fs_userns)) uid = __kuid_val(kuid); else @@ -112,6 +123,8 @@ vfsgid_t make_vfsgid(struct mnt_idmap *idmap, if (idmap == &nop_mnt_idmap) return VFSGIDT_INIT(kgid); + if (idmap == &invalid_mnt_idmap) + return INVALID_VFSGID; if (initial_idmapping(fs_userns)) gid = __kgid_val(kgid); else @@ -140,6 +153,8 @@ kuid_t from_vfsuid(struct mnt_idmap *idmap, if (idmap == &nop_mnt_idmap) return AS_KUIDT(vfsuid); + if (idmap == &invalid_mnt_idmap) + return INVALID_UID; uid = map_id_up(&idmap->uid_map, __vfsuid_val(vfsuid)); if (uid == (uid_t)-1) return INVALID_UID; @@ -167,6 +182,8 @@ kgid_t from_vfsgid(struct mnt_idmap *idmap, if (idmap == &nop_mnt_idmap) return AS_KGIDT(vfsgid); + if (idmap == &invalid_mnt_idmap) + return INVALID_GID; gid = map_id_up(&idmap->gid_map, __vfsgid_val(vfsgid)); if (gid == (gid_t)-1) return INVALID_GID; @@ -296,7 +313,7 @@ struct mnt_idmap *alloc_mnt_idmap(struct user_namespace *mnt_userns) */ struct mnt_idmap *mnt_idmap_get(struct mnt_idmap *idmap) { - if (idmap != &nop_mnt_idmap) + if (idmap != &nop_mnt_idmap && idmap != &invalid_mnt_idmap) refcount_inc(&idmap->count); return idmap; @@ -312,7 +329,8 @@ EXPORT_SYMBOL_GPL(mnt_idmap_get); */ void mnt_idmap_put(struct mnt_idmap *idmap) { - if (idmap != &nop_mnt_idmap && refcount_dec_and_test(&idmap->count)) + if (idmap != &nop_mnt_idmap && idmap != &invalid_mnt_idmap && + refcount_dec_and_test(&idmap->count)) free_mnt_idmap(idmap); } EXPORT_SYMBOL_GPL(mnt_idmap_put); diff --git a/include/linux/mnt_idmapping.h b/include/linux/mnt_idmapping.h index cd4d5c8781f5..b1b219bc3422 100644 --- a/include/linux/mnt_idmapping.h +++ b/include/linux/mnt_idmapping.h @@ -9,6 +9,7 @@ struct mnt_idmap; struct user_namespace; extern struct mnt_idmap nop_mnt_idmap; +extern struct mnt_idmap invalid_mnt_idmap; extern struct user_namespace init_user_ns; typedef struct { From patchwork Fri Sep 6 14:34:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Mikhalitsyn X-Patchwork-Id: 13794266 Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 427001D3189 for ; Fri, 6 Sep 2024 14:35:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.125.188.122 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725633314; cv=none; b=e8oKRrxlgMCm3a60KCfSAmJcw3JZzHjYg02etlqMnfOF8GkGJKbD4QN38le0+KahFGwrTuNwEDSqreIyT0mYXBv/mnsN7DRqO55qp9GwE2Yf7k8tpz09Lo+fHC+bPjFuF87VvmwXCSGy2Vyidl/5mgJL/L7Kv21iCbsN4ZrlDjc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725633314; c=relaxed/simple; bh=534DgAJ0D8qJtVjjpSo8v98NEf5nHaEOPP1nax1XHpw=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=e3aocwNrmi8tQoRXBw1Uws1ogjoOWNQrt+UzbK6cgstR8RpeV8N1ya/tD50VzHEDrdd+8dyb14+ZLiDWan873GUi8o8Sru09YbksGTsljO1Ne3Z7dmr3hblMVRQ4v1LNiF3fPZX2olCYcGk4Klg4Hh2SRcLsV6cFtRGq/hYXnBk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com; spf=pass smtp.mailfrom=canonical.com; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b=hoeKX/32; arc=none smtp.client-ip=185.125.188.122 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canonical.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canonical.com header.i=@canonical.com header.b="hoeKX/32" Received: from mail-lf1-f69.google.com (mail-lf1-f69.google.com [209.85.167.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-0.canonical.com (Postfix) with ESMTPS id 507B93F5B8 for ; Fri, 6 Sep 2024 14:35:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1725633310; bh=RmZbkiefQJov/K5sBneAkkza7xrJwBfUJ2uOjsmm8Fs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=hoeKX/323CqPQQ2u/lrIILaw/IjqF0Pr7zDE2C+TkcoXvr6apnBLievrdHYFw6Uc+ or06a3xua/eBV1/Pn2WS7YSy7qsSn7Yn2sxuq4/9iScANvnczYDH+HXdVL4G3GUiM0 VlXfwEhjsv8jEMGESE7QneKwdXrpwy116EzkSc12aNWKPLooC7ieQoZl/hUMEI3HsV J75my+V2XGuZKHDgg+orG34XUO6FQv0DM1sLlvhjKQci70iCv4y7MpwHhNDCSmncxa zU1Gl31bMWj2GLPXe8wyH0o9W2JPoV9LnToZCHuUJoqcchJHGHmnL5KBcYLxlu0PgI /iG6N5GQJovWg== Received: by mail-lf1-f69.google.com with SMTP id 2adb3069b0e04-5343a54e108so2090113e87.0 for ; Fri, 06 Sep 2024 07:35:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725633309; x=1726238109; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=RmZbkiefQJov/K5sBneAkkza7xrJwBfUJ2uOjsmm8Fs=; b=aLaxNUsSdAnS3l7utB88GhdrUx0NEFEeAD3v0GuI0mr0dJxMHHnJ+SnZ7BLcJnddj+ mIubagTQka7J5BZgsZ+ZWd6vTYdPvvB71T2MO9hM4x/vLpuh5mmptdwJXBG5acdDAdYr WBu3rtf7j3Xp3VkkBHasFJp+s1ouneq3Oucxq5y9C2lmkj6fN7sXGGW9OziAD5QLmDqL QeZXh9lOw8IPA4lzy3ThCUx0gUnDD7c5GmyPhIce1Xoi8aNNW828BXAjPuV6rqPqnKQo ZZPKV3sCSGW1gAqkRmYczYmvXxCxS/cwYulvjWRS1E5UjGda4kG8ePZ2UFWkb+ooYYB4 YDyw== X-Forwarded-Encrypted: i=1; AJvYcCUzod/NE87eeoaKTnkjWycBx8u0oMjTxFD2NXP3yJg4I3BfRhL76LbJNMv1EkBi5kktdcxH/NpnEbmPszFp@vger.kernel.org X-Gm-Message-State: AOJu0YwgBu5yxVk8EHH4QHD9aCCURrhaoj7sr8ouBE8N3D9JCO8TzIpl GryizBn/VkV2uLBMFCAtJe7PLh6+4BDanVqXA8bmGllMPRgsQfTfVwXbeOmt80gAdz0N0XotZXu 5RcjZ//Ne0RvtE0Q9XDN0HH2tMeNacKdsHcDRgrJlA0HRL1YIy7PtgJ7Xlae1QkWol4n105IZJs Tx9bA= X-Received: by 2002:a05:6512:3d09:b0:530:b871:eb9a with SMTP id 2adb3069b0e04-536588067b5mr2251701e87.47.1725633308741; Fri, 06 Sep 2024 07:35:08 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG83mvznC7hs+nx8gK/BrkaCD9AoiB5al3t+MVykimwEDs6U9Y3xZBKl0YrkESBcyajurROkg== X-Received: by 2002:a05:6512:3d09:b0:530:b871:eb9a with SMTP id 2adb3069b0e04-536588067b5mr2251678e87.47.1725633308238; Fri, 06 Sep 2024 07:35:08 -0700 (PDT) Received: from amikhalitsyn.. ([188.192.113.77]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a8a6236cee0sm281787466b.101.2024.09.06.07.35.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 06 Sep 2024 07:35:07 -0700 (PDT) From: Alexander Mikhalitsyn To: mszeredi@redhat.com Cc: brauner@kernel.org, linux-fsdevel@vger.kernel.org, Alexander Mikhalitsyn , Miklos Szeredi , linux-kernel@vger.kernel.org Subject: [PATCH v1 3/3] fs/fuse: convert to use invalid_mnt_idmap Date: Fri, 6 Sep 2024 16:34:53 +0200 Message-Id: <20240906143453.179506-3-aleksandr.mikhalitsyn@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240906143453.179506-1-aleksandr.mikhalitsyn@canonical.com> References: <20240906143453.179506-1-aleksandr.mikhalitsyn@canonical.com> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We should convert fs/fuse code to use a newly introduced invalid_mnt_idmap instead of passing a NULL as idmap pointer. Suggested-by: Christian Brauner Signed-off-by: Alexander Mikhalitsyn Reviewed-by: Christian Brauner --- fs/fuse/dev.c | 47 +++++++++++++++++++++++------------------------ fs/fuse/dir.c | 6 +++--- fs/fuse/fuse_i.h | 2 +- 3 files changed, 27 insertions(+), 28 deletions(-) diff --git a/fs/fuse/dev.c b/fs/fuse/dev.c index 04a6490a587c..e42b2f38d35f 100644 --- a/fs/fuse/dev.c +++ b/fs/fuse/dev.c @@ -114,7 +114,11 @@ static struct fuse_req *fuse_get_req(struct mnt_idmap *idmap, { struct fuse_conn *fc = fm->fc; struct fuse_req *req; + bool no_idmap = (fm->sb->s_iflags & SB_I_NOIDMAP); + kuid_t fsuid; + kgid_t fsgid; int err; + atomic_inc(&fc->num_waiting); if (fuse_block_alloc(fc, for_background)) { @@ -148,29 +152,24 @@ static struct fuse_req *fuse_get_req(struct mnt_idmap *idmap, if (for_background) __set_bit(FR_BACKGROUND, &req->flags); - if ((fm->sb->s_iflags & SB_I_NOIDMAP) || idmap) { - kuid_t idmapped_fsuid; - kgid_t idmapped_fsgid; + /* + * Keep the old behavior when idmappings support was not + * declared by a FUSE server. + * + * For those FUSE servers who support idmapped mounts, + * we send UID/GID only along with "inode creation" + * fuse requests, otherwise idmap == &invalid_mnt_idmap and + * req->in.h.{u,g}id will be equal to FUSE_INVALID_UIDGID. + */ + fsuid = no_idmap ? current_fsuid() : mapped_fsuid(idmap, fc->user_ns); + fsgid = no_idmap ? current_fsgid() : mapped_fsgid(idmap, fc->user_ns); + req->in.h.uid = from_kuid(fc->user_ns, fsuid); + req->in.h.gid = from_kgid(fc->user_ns, fsgid); - /* - * Note, that when - * (fm->sb->s_iflags & SB_I_NOIDMAP) is true, then - * (idmap == &nop_mnt_idmap) is always true and therefore, - * mapped_fsuid(idmap, fc->user_ns) == current_fsuid(). - */ - idmapped_fsuid = idmap ? mapped_fsuid(idmap, fc->user_ns) : current_fsuid(); - idmapped_fsgid = idmap ? mapped_fsgid(idmap, fc->user_ns) : current_fsgid(); - req->in.h.uid = from_kuid(fc->user_ns, idmapped_fsuid); - req->in.h.gid = from_kgid(fc->user_ns, idmapped_fsgid); - - if (unlikely(req->in.h.uid == ((uid_t)-1) || - req->in.h.gid == ((gid_t)-1))) { - fuse_put_request(req); - return ERR_PTR(-EOVERFLOW); - } - } else { - req->in.h.uid = FUSE_INVALID_UIDGID; - req->in.h.gid = FUSE_INVALID_UIDGID; + if (no_idmap && unlikely(req->in.h.uid == ((uid_t)-1) || + req->in.h.gid == ((gid_t)-1))) { + fuse_put_request(req); + return ERR_PTR(-EOVERFLOW); } return req; @@ -619,7 +618,7 @@ int fuse_simple_background(struct fuse_mount *fm, struct fuse_args *args, __set_bit(FR_BACKGROUND, &req->flags); } else { WARN_ON(args->nocreds); - req = fuse_get_req(NULL, fm, true); + req = fuse_get_req(&invalid_mnt_idmap, fm, true); if (IS_ERR(req)) return PTR_ERR(req); } @@ -641,7 +640,7 @@ static int fuse_simple_notify_reply(struct fuse_mount *fm, struct fuse_req *req; struct fuse_iqueue *fiq = &fm->fc->iq; - req = fuse_get_req(NULL, fm, false); + req = fuse_get_req(&invalid_mnt_idmap, fm, false); if (IS_ERR(req)) return PTR_ERR(req); diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 491e112819be..54104dd48af7 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1093,7 +1093,7 @@ static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir, if (fc->no_rename2 || fc->minor < 23) return -EINVAL; - err = fuse_rename_common((flags & RENAME_WHITEOUT) ? idmap : NULL, + err = fuse_rename_common((flags & RENAME_WHITEOUT) ? idmap : &invalid_mnt_idmap, olddir, oldent, newdir, newent, flags, FUSE_RENAME2, sizeof(struct fuse_rename2_in)); @@ -1102,7 +1102,7 @@ static int fuse_rename2(struct mnt_idmap *idmap, struct inode *olddir, err = -EINVAL; } } else { - err = fuse_rename_common(NULL, olddir, oldent, newdir, newent, 0, + err = fuse_rename_common(&invalid_mnt_idmap, olddir, oldent, newdir, newent, 0, FUSE_RENAME, sizeof(struct fuse_rename_in)); } @@ -1127,7 +1127,7 @@ static int fuse_link(struct dentry *entry, struct inode *newdir, args.in_args[0].value = &inarg; args.in_args[1].size = newent->d_name.len + 1; args.in_args[1].value = newent->d_name.name; - err = create_new_entry(NULL, fm, &args, newdir, newent, inode->i_mode); + err = create_new_entry(&invalid_mnt_idmap, fm, &args, newdir, newent, inode->i_mode); if (!err) fuse_update_ctime_in_cache(inode); else if (err == -EINTR) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index b2c7834f21b5..e6cc3d552b13 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1153,7 +1153,7 @@ ssize_t __fuse_simple_request(struct mnt_idmap *idmap, static inline ssize_t fuse_simple_request(struct fuse_mount *fm, struct fuse_args *args) { - return __fuse_simple_request(NULL, fm, args); + return __fuse_simple_request(&invalid_mnt_idmap, fm, args); } static inline ssize_t fuse_simple_idmap_request(struct mnt_idmap *idmap,