overlayfs: Optimize override/revert creds
Subsystems (4)
v3 cover overlayfs: Optimize override/revert creds
Hi,
Changes from RFC v2:
- Added separate patches for the warnings for the discarded const when using the cleanup macros: one for DEFINE_GUARD() and one for DEFINE_LOCK_GUARD_1() (I am uncertain if it's better to squash them together);
- Reordered the series so the backing file patch is the first user of the introduced helpers (Amir Goldstein);
- Change the definition of the cleanup "class" from a GUARD to a LOCK_GUARD_1, which defines an implicit container, that allows us to remove some variable declarations to store the overriden credentials (Amir Goldstein);
- Replaced most of the uses of scoped_guard() with guard(), to reduce the code churn, the remaining ones I wasn't sure if I was changing the behavior: either they were nested (overrides "inside" overrides) or something calls current_cred() (Amir Goldstein).
New questions:
- The backing file callbacks are now called with the "light" overriden credentials, so they are kind of restricted in what they can do with their credentials, is this acceptable in general?
- in ovl_rename() I had to manually call the "light" the overrides, both using the guard() macro or using the non-light version causes the workload to crash the kernel. I still have to investigate why this is happening. Hints are appreciated.
Link to the RFC v2:
https://lore.kernel.org/r/[email protected]/
Original cover letter (lightly edited):
It was noticed that some workloads suffer from contention on increasing/decrementing the ->usage counter in their credentials, those refcount operations are associated with overriding/reverting the current task credentials. (the linked thread adds more context)
In some specialized cases, overlayfs is one of them, the credentials in question have a longer lifetime than the override/revert "critical section". In the overlayfs case, the credentials are created when the fs is mounted and destroyed when it's unmounted. In this case of long lived credentials, the usage counter doesn't need to be incremented/decremented.
Add a lighter version of credentials override/revert to be used in these specialized cases. To make sure that the override/revert calls are paired, add a cleanup guard macro. This was suggested here:
https://lore.kernel.org/all/20231219-marken-pochen-26d888fb9bb9@brauner/
With a small number of tweaks:
- Used inline functions instead of macros;
- A small change to store the credentials into the passed argument, the guard is now defined as (note the added '_T ='):
DEFINE_GUARD(cred, const struct cred *, _T = override_creds_light(_T),
revert_creds_light(_T));
- Allow "const" arguments to be used with these kind of guards;
Some comments:
- If patch 1/5 and 2/5 are not a good idea (adding the cast), the alternative I can see is using some kind of container for the credentials;
- The only user for the backing file ops is overlayfs, so these changes make sense, but may not make sense in the most general case;
For the numbers, some from 'perf c2c', before this series:
(edited to fit)
#
# ----- HITM ----- Shared
# Num RmtHitm LclHitm Symbol Object Source:Line Node
# ..... ....... ....... .......................... ................ .................. ....
#
-------------------------
0 412 1028
-------------------------
41.50% 42.22% [k] revert_creds [kernel.vmlinux] atomic64_64.h:39 0 1
15.05% 10.60% [k] override_creds [kernel.vmlinux] atomic64_64.h:25 0 1
0.73% 0.58% [k] init_file [kernel.vmlinux] atomic64_64.h:25 0 1
0.24% 0.10% [k] revert_creds [kernel.vmlinux] cred.h:266 0 1
32.28% 37.16% [k] generic_permission [kernel.vmlinux] mnt_idmapping.h:81 0 1
9.47% 8.75% [k] generic_permission [kernel.vmlinux] mnt_idmapping.h:81 0 1
0.49% 0.58% [k] inode_owner_or_capable [kernel.vmlinux] mnt_idmapping.h:81 0 1
0.24% 0.00% [k] generic_permission [kernel.vmlinux] namei.c:354 0-------------------------
1 50 103 ------------------------- 100.00% 100.00% [k] update_cfs_group [kernel.vmlinux] atomic64_64.h:15 0 1
-------------------------
2 50 98 ------------------------- 96.00% 96.94% [k] update_cfs_group [kernel.vmlinux] atomic64_64.h:15 0 1 2.00% 1.02% [k] update_load_avg [kernel.vmlinux] atomic64_64.h:25 0 1 0.00% 2.04% [k] update_load_avg [kernel.vmlinux] fair.c:4118 0 2.00% 0.00% [k] update_cfs_group [kernel.vmlinux] fair.c:3932 0 1
after this series:
#
# ----- HITM ----- Shared
# Num RmtHitm LclHitm Symbol Object Source:Line Node
# ..... ....... ....... .................... ................ ................ ....
#
-------------------------
0 54 88
-------------------------
100.00% 100.00% [k] update_cfs_group [kernel.vmlinux] atomic64_64.h:15 0 1-------------------------
1 48 83 ------------------------- 97.92% 97.59% [k] update_cfs_group [kernel.vmlinux] atomic64_64.h:15 0 1 2.08% 1.20% [k] update_load_avg [kernel.vmlinux] atomic64_64.h:25 0 1 0.00% 1.20% [k] update_load_avg [kernel.vmlinux] fair.c:4118 0 1
-------------------------
2 28 44 ------------------------- 85.71% 79.55% [k] generic_permission [kernel.vmlinux] mnt_idmapping.h:81 0 1 14.29% 20.45% [k] generic_permission [kernel.vmlinux] mnt_idmapping.h:81 0 1
The contention is practically gone.
Vinicius Costa Gomes (5):
cleanup: Fix discarded const warning when defining lock guard
cleanup: Fix discarded const warning when defining guard
cred: Add a light version of override/revert_creds()
fs: Optimize credentials reference count for backing file ops
overlayfs: Optimize credentials usage
fs/backing-file.c | 27 +++++-------------- fs/overlayfs/copy_up.c | 4 +-- fs/overlayfs/dir.c | 23 +++++++--------- fs/overlayfs/file.c | 28 +++++-------------- fs/overlayfs/inode.c | 59 +++++++++++++++-------------------------- fs/overlayfs/namei.c | 20 ++++---------- fs/overlayfs/readdir.c | 16 +++-------- fs/overlayfs/util.c | 10 +++---- fs/overlayfs/xattrs.c | 33 +++++++++-------------- include/linux/cleanup.h | 4 +-- include/linux/cred.h | 21 +++++++++++++++ kernel/cred.c | 6 ++--- 12 files changed, 97 insertions(+), 154 deletions(-)
Signature · 1 line
2.43.0
RFC v3 1/5 cleanup: Fix discarded const warning when defining lock guard
Fix the following warning when defining a cleanup guard for a "const" pointer type:
./include/linux/cleanup.h:211:18: warning: return discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
211 | return _T->lock; \
| ~~^~~~~~
./include/linux/cleanup.h:233:1: note: in expansion of macro ‘__DEFINE_UNLOCK_GUARD’
233 | __DEFINE_UNLOCK_GUARD(_name, _type, _unlock, __VA_ARGS__) \
| ^~~~~~~~~~~~~~~~~~~~~
./include/linux/cred.h:193:1: note: in expansion of macro ‘DEFINE_LOCK_GUARD_1’
193 | DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock),
| ^~~~~~~~~~~~~~~~~~~--- include/linux/cleanup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/cleanup.h +1 -1
@@ -208,7 +208,7 @@ static inline void class_##_name##_destructor(class_##_name##_t *_T) \ \ static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T) \ { \ -return _T->lock; \ +return (void *)_T->lock; \ }
Signature · 1 line
2.43.1
Christian Brauner
maintainerRe: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
Quoted 23 lines · Vinicius Costa Gomes
Fix the following warning when defining a cleanup guard for a "const" pointer type:
./include/linux/cleanup.h:211:18: warning: return discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]211 | return _T->lock; \ | ~~^~~~~~ ./include/linux/cleanup.h:233:1: note: in expansion of macro ‘__DEFINE_UNLOCK_GUARD’ 233 | __DEFINE_UNLOCK_GUARD(_name, _type, _unlock, __VA_ARGS__) \ | ^~~~~~~~~~~~~~~~~~~~~ ./include/linux/cred.h:193:1: note: in expansion of macro ‘DEFINE_LOCK_GUARD_1’ 193 | DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock), | ^~~~~~~~~~~~~~~~~~~Signed-off-by Vinicius Costa Gomes <[email protected]>--- include/linux/cleanup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/cleanup.h +0
-0
include/linux/cleanup.h static inline void class_##_name##_destructor(class_##_name##_t *_T) \ · line 212
Quoted 6 lines
include/linux/cleanup.h +1
-1@@ -208,7 +208,7 @@ static inline void class_##_name##_destructor(class_##_name##_t *_T) \ \ static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T) \ { \ -return _T->lock; \ +return (void *)_T->lock; \ }
I think both of these patches are a bit ugly as we burden the generic cleanup code with casting to void which could cause actual issues.
Casting from const to non-const is rather specific to the cred code so I would rather like to put the burden on the cred code instead of the generic code if possible.
Christian Brauner
maintainerRe: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
Quoted 34 lines · Christian Brauner
Quoted 23 lines · Vinicius Costa Gomes
Fix the following warning when defining a cleanup guard for a "const" pointer type:
./include/linux/cleanup.h:211:18: warning: return discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]211 | return _T->lock; \ | ~~^~~~~~ ./include/linux/cleanup.h:233:1: note: in expansion of macro ‘__DEFINE_UNLOCK_GUARD’ 233 | __DEFINE_UNLOCK_GUARD(_name, _type, _unlock, __VA_ARGS__) \ | ^~~~~~~~~~~~~~~~~~~~~ ./include/linux/cred.h:193:1: note: in expansion of macro ‘DEFINE_LOCK_GUARD_1’ 193 | DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock), | ^~~~~~~~~~~~~~~~~~~Signed-off-by Vinicius Costa Gomes <[email protected]>--- include/linux/cleanup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)include/linux/cleanup.h +0
-0include/linux/cleanup.h static inline void class_##_name##_destructor(class_##_name##_t *_T) \ · line 212
Quoted 6 lines
include/linux/cleanup.h +1
-1@@ -208,7 +208,7 @@ static inline void class_##_name##_destructor(class_##_name##_t *_T) \ \ static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T) \ { \ -return _T->lock; \ +return (void *)_T->lock; \ }I think both of these patches are a bit ugly as we burden the generic cleanup code with casting to void which could cause actual issues.
Quoted 3 lines
Casting from const to non-const is rather specific to the cred code so I would rather like to put the burden on the cred code instead of the generic code if possible.
So something like this? (Amir?)
fs/backing-file.c +5 -5
@@ -152,7 +152,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter, !(file->f_mode & FMODE_CAN_ODIRECT))return -EINVAL ; -guard (cred)(ctx->cred); +cred_guard (ctx->cred);if (is_sync_kiocb (iocb)) {rwf_t rwf =iocb_to_rw_flags (flags);
@@ -206,7 +206,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,*/ flags &= ~IOCB_DIO_CALLER_COMP ; -guard (cred)(ctx->cred); +cred_guard (ctx->cred);if (is_sync_kiocb (iocb)) {rwf_t rwf =iocb_to_rw_flags (flags);
@@ -250,7 +250,7 @@ ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,if (WARN_ON_ONCE (!(in->f_mode &FMODE_BACKING )))return -EIO ; -guard (cred)(ctx->cred); +cred_guard (ctx->cred); ret =vfs_splice_read (in, ppos, pipe, len, flags);if (ctx->accessed)
@@ -274,7 +274,7 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,if (ret)return ret; -guard (cred)(ctx->cred); +cred_guard (ctx->cred);file_start_write (out); ret =iter_file_splice_write (pipe, out, ppos, len, flags);file_end_write (out);
@@ -300,7 +300,7 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,vma_set_file (vma, file); -guard (cred)(ctx->cred); +cred_guard (ctx->cred); ret =call_mmap (vma->vm_file, vma);if (ctx->accessed)
fs/overlayfs/copy_up.c +1 -1
@@ -1199,7 +1199,7 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)if (err)return err; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb));while (!err) {struct dentry *next;struct dentry *parent =NULL ;
fs/overlayfs/dir.c +2 -2
@@ -686,7 +686,7 @@ static int ovl_set_link_redirect(struct dentry *dentry) {int err; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); err =ovl_set_redirect (dentry, false);return err;
@@ -891,7 +891,7 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir)if (err) goto out; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb));if (!lower_positive) err =ovl_remove_upper (dentry, is_dir, &list);else
fs/overlayfs/file.c +7 -7
@@ -41,7 +41,7 @@ static struct file *ovl_open_realfile(const struct file *file,if (flags &O_APPEND ) acc_mode |=MAY_APPEND ; -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb)); real_idmap =mnt_idmap (realpath->mnt); err =inode_permission (real_idmap, realinode,MAY_OPEN | acc_mode);if (err) {
@@ -211,7 +211,7 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)ovl_inode_lock (inode); real.file->f_pos = file->f_pos; -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb)); ret =vfs_llseek (real.file, offset, whence); file->f_pos = real.file->f_pos;
@@ -396,7 +396,7 @@ static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync)/* Don't sync lower file for fear of receiving EROFS error */ if (file_inode (real.file) ==ovl_inode_upper (file_inode (file))) { -guard (cred)(ovl_creds (file_inode (file)->i_sb)); +cred_guard (ovl_creds (file_inode (file)->i_sb)); ret =vfs_fsync_range (real.file, start, end, datasync); }
@@ -434,7 +434,7 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenif (ret) goto out_unlock; -guard (cred)(ovl_creds (file_inode (file)->i_sb)); +cred_guard (ovl_creds (file_inode (file)->i_sb)); ret =vfs_fallocate (real.file, mode, offset, len);/* Update size */
@@ -457,7 +457,7 @@ static int ovl_fadvise(struct file *file, loff_t offset, loff_t len, int advice)if (ret)return ret; -guard (cred)(ovl_creds (file_inode (file)->i_sb)); +cred_guard (ovl_creds (file_inode (file)->i_sb)); ret =vfs_fadvise (real.file, offset, len, advice);fdput (real);
@@ -498,7 +498,7 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, goto out_unlock; } -guard (cred)(ovl_creds (file_inode (file_out)->i_sb)); +cred_guard (ovl_creds (file_inode (file_out)->i_sb));switch (op) {case OVL_COPY : ret = vfs_copy_file_range(real_in.file, pos_in,
@@ -574,7 +574,7 @@ static int ovl_flush(struct file *file, fl_owner_t id)return err;if (real.file->f_op->flush) { -guard (cred)(ovl_creds (file_inode (file)->i_sb)); +cred_guard (ovl_creds (file_inode (file)->i_sb)); err = real.file->f_op->flush (real.file, id); }fdput (real);
fs/overlayfs/inode.c +10 -10
@@ -78,7 +78,7 @@ int ovl_setattr(struct mnt_idmap *idmap, struct dentry *dentry, goto out_put_write;inode_lock (upperdentry->d_inode); -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); err =ovl_do_notify_change (ofs, upperdentry, attr);
@@ -169,7 +169,7 @@ int ovl_getattr(struct mnt_idmap *idmap, const struct path *path, metacopy_blocks =ovl_is_metacopy_dentry (dentry); type =ovl_path_real (dentry, &realpath); -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); err =ovl_do_getattr (&realpath, stat, request_mask, flags);if (err) goto out;
@@ -306,7 +306,7 @@ int ovl_permission(struct mnt_idmap *idmap,if (err)return err; -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb));if (!upperinode && !special_file (realinode->i_mode) && mask &MAY_WRITE ) {
@@ -328,7 +328,7 @@ static const char *ovl_get_link(struct dentry *dentry,if (!dentry)return ERR_PTR (-ECHILD ); -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb)); p =vfs_get_link (ovl_dentry_real (dentry), done);return p;
@@ -461,7 +461,7 @@ struct posix_acl *do_ovl_get_acl(struct mnt_idmap *idmap, acl =get_cached_acl_rcu (realinode, type); }else { -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb)); acl =ovl_get_acl_path (&realpath,posix_acl_xattr_name (type), noperm); }
@@ -487,7 +487,7 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,struct posix_acl *real_acl;ovl_path_lower (dentry, &realpath); -scoped_guard (cred,ovl_creds (dentry->d_sb)) +cred_scoped_guard (ovl_creds (dentry->d_sb)) real_acl = vfs_get_acl(mnt_idmap(realpath.mnt), realdentry, acl_name);
@@ -510,7 +510,7 @@ static int ovl_set_or_remove_acl(struct dentry *dentry, struct inode *inode,if (err) goto out; - scoped_guard(cred, ovl_creds(dentry->d_sb)) { + cred_scoped_guard(ovl_creds(dentry->d_sb)) {if (acl) err =ovl_do_set_acl (ofs, realdentry, acl_name, acl);else
@@ -589,7 +589,7 @@ static int ovl_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo,if (!realinode->i_op->fiemap)return -EOPNOTSUPP ; -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb)); err = realinode->i_op->fiemap (realinode, fieinfo, start, len);return err;
@@ -649,7 +649,7 @@ int ovl_fileattr_set(struct mnt_idmap *idmap,if (err) goto out; -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb));/* * Store immutable/append-only flags in xattr and clear them * in upper fileattr (in case they were set by older kernel)
@@ -717,7 +717,7 @@ int ovl_fileattr_get(struct dentry *dentry, struct fileattr *fa)ovl_path_real (dentry, &realpath); -guard (cred)(ovl_creds (inode->i_sb)); +cred_guard (ovl_creds (inode->i_sb)); err =ovl_real_fileattr_get (&realpath, fa);ovl_fileattr_prot_flags (inode, fa);
fs/overlayfs/namei.c +4 -4
@@ -953,7 +953,7 @@ static int ovl_maybe_validate_verity(struct dentry *dentry)return err;if (!ovl_test_flag (OVL_VERIFIED_DIGEST , inode)) { -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); err =ovl_validate_verity (ofs, &metapath, &datapath);if (err ==0 )
@@ -988,7 +988,7 @@ static int ovl_maybe_lookup_lowerdata(struct dentry *dentry)if (ovl_dentry_lowerdata (dentry)) goto out; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); err =ovl_lookup_data_layers (dentry, redirect, &datapath);if (err)
@@ -1055,7 +1055,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,if (dentry->d_name.len > ofs->namelen)return ERR_PTR (-ENAMETOOLONG ); -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); upperdir =ovl_dentry_upper (dentry->d_parent);if (upperdir) { d.layer = &ofs->layers[0 ];
@@ -1381,7 +1381,7 @@ bool ovl_lower_positive(struct dentry *dentry)if (!ovl_dentry_upper (dentry))return true; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb));/* Positive upper -> have to look up lower to see whether it exists */ for (i =0 ; !done && !positive && i <ovl_numlower (poe); i++) {struct dentry *this;
fs/overlayfs/readdir.c +4 -4
@@ -274,7 +274,7 @@ static int ovl_check_whiteouts(const struct path *path, struct ovl_readdir_datastruct ovl_cache_entry *p;struct dentry *dentry, *dir = path->dentry; -guard (cred)(ovl_creds (rdd->dentry->d_sb)); +cred_guard (ovl_creds (rdd->dentry->d_sb)); err =down_write_killable (&dir->d_inode->i_rwsem);if (!err) {
@@ -753,7 +753,7 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)struct ovl_cache_entry *p;int err; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb));if (!ctx->pos)ovl_dir_reset (file);
@@ -853,7 +853,7 @@ static struct file *ovl_dir_open_realfile(const struct file *file, {struct file *res; -guard (cred)(ovl_creds (file_inode (file)->i_sb)); +cred_guard (ovl_creds (file_inode (file)->i_sb)); res =ovl_path_open (realpath,O_RDONLY | (file->f_flags &O_LARGEFILE ));return res;
@@ -978,7 +978,7 @@ int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)struct ovl_cache_entry *p, *n;struct rb_root root =RB_ROOT ; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); err =ovl_dir_read_merged (dentry, list, &root);if (err)return err;
fs/overlayfs/util.c +2 -2
@@ -1169,7 +1169,7 @@ int ovl_nlink_start(struct dentry *dentry)if (d_is_dir (dentry) || !ovl_test_flag (OVL_INDEX , inode))return 0 ; -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb));/* * The overlay inode nlink should be incremented/decremented IFF the * upper operation succeeds, along with nlink change of upper inode.
@@ -1198,7 +1198,7 @@ void ovl_nlink_end(struct dentry *dentry)ovl_drop_write (dentry);if (ovl_test_flag (OVL_INDEX , inode) && inode->i_nlink ==0 ) { -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb));ovl_cleanup_index (dentry); }
fs/overlayfs/xattrs.c +5 -4
@@ -1,5 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only +#include <linux/cred.h> #include <linux/fs.h> #include <linux/xattr.h> #include "overlayfs.h"
@@ -44,7 +45,7 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const charif (!value && !upperdentry) {ovl_path_lower (dentry, &realpath); -scoped_guard (cred,ovl_creds (dentry->d_sb)) +cred_scoped_guard (ovl_creds (dentry->d_sb)) err = vfs_getxattr(mnt_idmap(realpath.mnt), realdentry, name, NULL, 0);if (err <0 ) goto out;
@@ -62,7 +63,7 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const charif (err) goto out; - scoped_guard(cred, ovl_creds(dentry->d_sb)) { + cred_scoped_guard(ovl_creds(dentry->d_sb)) {if (value) { err =ovl_do_setxattr (ofs, realdentry, name, value, size, flags);
@@ -86,7 +87,7 @@ static int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const charstruct path realpath;ovl_i_path_real (inode, &realpath); -guard (cred)(ovl_creds (dentry->d_sb)); +cred_guard (ovl_creds (dentry->d_sb)); res =vfs_getxattr (mnt_idmap (realpath.mnt), realpath.dentry, name, value, size);return res; }
@@ -114,7 +115,7 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)char *s;size_t prefix_len, name_len; -scoped_guard (cred,ovl_creds (dentry->d_sb)) +cred_scoped_guard (ovl_creds (dentry->d_sb)) res = vfs_listxattr(realdentry, list, size);if (res <=0 || size ==0 )return res;
include/linux/cred.h +6 -3
@@ -171,7 +171,6 @@ static inline bool cap_ambient_invariant_ok(const struct cred *cred)cap_intersect (cred->cap_permitted, cred->cap_inheritable)); } -/* * Override creds without bumping reference count. Caller must ensure * reference remains valid or has taken reference. Almost always not the
@@ -190,8 +189,12 @@ static inline void revert_creds_light(const struct cred *revert_cred)rcu_assign_pointer (current->cred, revert_cred); } -DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock), -revert_creds_light (_T->lock)); +DEFINE_LOCK_GUARD_1(cred, struct cred, + _T->lock = (struct cred *)override_creds_light (_T->lock), +revert_creds_light (_T->lock)); + +#define cred_guard (_cred) guard(cred)(((struct cred *)_cred)) +#define cred_scoped_guard (_cred) scoped_guard(cred, ((struct cred *)_cred))/** * get_new_cred_many - Get references on a new set of credentials
Re: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
Quoted 5 lines · Christian Brauner
So something like this? (Amir?)
include/linux/cred.h +0
-1-DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock),
include/linux/cred.h static inline void revert_creds_light(const struct cred *revert_cred) · line 200
Quoted 10 lines
include/linux/cred.h +6
-1- revert_creds_light(_T->lock)); +DEFINE_LOCK_GUARD_1(cred, struct cred, + _T->lock = (struct cred *)override_creds_light (_T->lock), +revert_creds_light (_T->lock)); + +#define cred_guard (_cred) guard(cred)(((struct cred *)_cred)) +#define cred_scoped_guard (_cred) scoped_guard(cred, ((struct cred *)_cred))/** * get_new_cred_many - Get references on a new set of credentials
Thinking about proposing a PATCH version (with these suggestions applied), Amir has suggested in the past that I should propose two separate series:
(1) introducing the guard helpers + backing file changes;
(2) overlayfs changes;
Any new ideas about this? Or should I go with this plan?
Cheers,
Signature · 1 line
Vinicius
Christian Brauner
maintainerRe: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
Quoted 23 lines · Vinicius Costa Gomes
Quoted 5 lines · Christian Brauner
So something like this? (Amir?)
include/linux/cred.h +0
-1-DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock),include/linux/cred.h static inline void revert_creds_light(const struct cred *revert_cred) · line 200
Quoted 10 lines
include/linux/cred.h +6
-1- revert_creds_light(_T->lock)); +DEFINE_LOCK_GUARD_1(cred, struct cred, + _T->lock = (struct cred *)override_creds_light (_T->lock), +revert_creds_light (_T->lock)); + +#define cred_guard (_cred) guard(cred)(((struct cred *)_cred)) +#define cred_scoped_guard (_cred) scoped_guard(cred, ((struct cred *)_cred))/** * get_new_cred_many - Get references on a new set of credentials Thinking about proposing a PATCH version (with these suggestions applied), Amir has suggested in the past that I should propose two separate series:
(1) introducing the guard helpers + backing file changes;
(2) overlayfs changes;
Quoted 1 line
Any new ideas about this? Or should I go with this plan?
I mean make it two separate patches and I can provide Amir with a stable branch for the cleanup guards. I think that's what he wanted.
Christian Brauner
maintainerRe: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
Quoted 24 lines · Christian Brauner
Quoted 23 lines · Vinicius Costa Gomes
Quoted 5 lines · Christian Brauner
So something like this? (Amir?)
include/linux/cred.h +0
-1-DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock),include/linux/cred.h static inline void revert_creds_light(const struct cred *revert_cred) · line 200
Quoted 10 lines
include/linux/cred.h +6
-1- revert_creds_light(_T->lock)); +DEFINE_LOCK_GUARD_1(cred, struct cred, + _T->lock = (struct cred *)override_creds_light (_T->lock), +revert_creds_light (_T->lock)); + +#define cred_guard (_cred) guard(cred)(((struct cred *)_cred)) +#define cred_scoped_guard (_cred) scoped_guard(cred, ((struct cred *)_cred))/** * get_new_cred_many - Get references on a new set of credentials Thinking about proposing a PATCH version (with these suggestions applied), Amir has suggested in the past that I should propose two separate series:
(1) introducing the guard helpers + backing file changes;
(2) overlayfs changes;
Quoted 4 lines
Quoted 1 line
Any new ideas about this? Or should I go with this plan?
I mean make it two separate patches and I can provide Amir with a stable branch for the cleanup guards. I think that's what he wanted.
But send them out in one series ofc. Amir and I can sort this if needed.
Re: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
Quoted 25 lines · Christian Brauner
Quoted 24 lines · Christian Brauner
Quoted 23 lines · Vinicius Costa Gomes
Quoted 5 lines · Christian Brauner
So something like this? (Amir?)
include/linux/cred.h +0
-1-DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock),include/linux/cred.h static inline void revert_creds_light(const struct cred *revert_cred) · line 200
Quoted 10 lines
include/linux/cred.h +6
-1- revert_creds_light(_T->lock)); +DEFINE_LOCK_GUARD_1(cred, struct cred, + _T->lock = (struct cred *)override_creds_light (_T->lock), +revert_creds_light (_T->lock)); + +#define cred_guard (_cred) guard(cred)(((struct cred *)_cred)) +#define cred_scoped_guard (_cred) scoped_guard(cred, ((struct cred *)_cred))/** * get_new_cred_many - Get references on a new set of credentials Thinking about proposing a PATCH version (with these suggestions applied), Amir has suggested in the past that I should propose two separate series:
(1) introducing the guard helpers + backing file changes;
(2) overlayfs changes;
Quoted 6 lines
Quoted 4 lines
Quoted 1 line
Any new ideas about this? Or should I go with this plan?
I mean make it two separate patches and I can provide Amir with a stable branch for the cleanup guards. I think that's what he wanted.
But send them out in one series ofc. Amir and I can sort this if needed.
Yeah, understood.
Thank you,
Signature · 1 line
Vinicius
Re: [RFC v3 1/5] cleanup: Fix discarded const warning when defining lock guard
In reply to Christian BraunerQuoted 19 lines · Christian Brauner
Quoted 18 lines · Vinicius Costa Gomes
Fix the following warning when defining a cleanup guard for a "const" pointer type:
./include/linux/cleanup.h:211:18: warning: return discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]211 | return _T->lock; \ | ~~^~~~~~ ./include/linux/cleanup.h:233:1: note: in expansion of macro ‘__DEFINE_UNLOCK_GUARD’ 233 | __DEFINE_UNLOCK_GUARD(_name, _type, _unlock, __VA_ARGS__) \ | ^~~~~~~~~~~~~~~~~~~~~ ./include/linux/cred.h:193:1: note: in expansion of macro ‘DEFINE_LOCK_GUARD_1’ 193 | DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock), | ^~~~~~~~~~~~~~~~~~~Signed-off-by Vinicius Costa Gomes <[email protected]>--- include/linux/cleanup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 14 lines
include/linux/cleanup.h static inline void class_##_name##_destructor(class_##_name##_t *_T) \ · line 212
Quoted 11 lines
include/linux/cleanup.h +1
-1@@ -208,7 +208,7 @@ static inline void class_##_name##_destructor(class_##_name##_t *_T) \ \ static inline void *class_##_name##_lock_ptr(class_##_name##_t *_T) \ { \ -return _T->lock; \ +return (void *)_T->lock; \ }I think both of these patches are a bit ugly as we burden the generic cleanup code with casting to void which could cause actual issues.
Fair point.
Quoted 4 lines
Casting from const to non-const is rather specific to the cred code so I would rather like to put the burden on the cred code instead of the generic code if possible.
For what it's worth, I liked your changes, will remove these two "fixes" from the series and use your suggestions in the next version.
Thank you,
Signature · 1 line
Vinicius
RFC v3 2/5 cleanup: Fix discarded const warning when defining guard
In reply to Vinicius Costa GomesWhen defining guards for const types the void* return implicitly discards the const modifier. Be explicit about it.
Compiler warning (gcc 13.2.1):
./include/linux/cleanup.h:154:18: warning: return discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
154 | { return *_T; }
| ^~~./include/linux/cred.h:193:1: note: in expansion of macro ‘DEFINE_GUARD’
193 | DEFINE_GUARD(cred, const struct cred *, _T = override_creds_light(_T),
| ^~~~~~~~~~~~
--- include/linux/cleanup.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/linux/cleanup.h +1 -1
@@ -151,7 +151,7 @@ static inline class_##_name##_t class_##_name##ext##_constructor(_init_args) \#define DEFINE_GUARD (_name, _type, _lock, _unlock) \ DEFINE_CLASS(_name, _type, if (_T) { _unlock; }, ({ _lock; _T; }), _type _T); \ static inline void * class_##_name##_lock_ptr(class_##_name##_t *_T) \ - { return *_T; } + { return (void *)*_T; }#define DEFINE_GUARD_COND (_name, _ext, _condlock) \ EXTEND_CLASS(_name, _ext, \
Signature · 1 line
2.43.1
RFC v3 3/5 cred: Add a light version of override/revert_creds()
In reply to Vinicius Costa GomesAdd a light version of override/revert_creds(), this should only be used when the credentials in question will outlive the critical section and the critical section doesn't change the ->usage of the credentials.
To make their usage less error prone, introduce cleanup guards to be used like this:
guard(cred)(credentials_to_override_and_restore);
or this:
scoped_guard(cred, credentials_to_override_and_restore) {
/* with credentials overridden */
}--- include/linux/cred.h | 21 +++++++++++++++++++++ kernel/cred.c | 6 +++--- 2 files changed, 24 insertions(+), 3 deletions(-)
include/linux/cred.h +21 -0
@@ -172,6 +172,27 @@ static inline bool cap_ambient_invariant_ok(const struct cred *cred) cred->cap_inheritable)); } +/* +* Override creds without bumping reference count. Caller must ensure +* reference remains valid or has taken reference. Almost always not the +* interface you want. Use override_creds()/revert_creds() instead. +*/ +static inline const struct cred *override_creds_light (const struct cred *override_cred) +{ +const struct cred *old = current->cred; + +rcu_assign_pointer (current->cred, override_cred); +return old; +} + +static inline void revert_creds_light (const struct cred *revert_cred) +{ +rcu_assign_pointer (current->cred, revert_cred); +} + +DEFINE_LOCK_GUARD_1(cred, const struct cred, _T->lock = override_creds_light(_T->lock), +revert_creds_light (_T->lock)); +/** * get_new_cred_many - Get references on a new set of credentials * @cred: The new credentials to reference
kernel/cred.c +3 -3
@@ -485,7 +485,7 @@ EXPORT_SYMBOL(abort_creds);*/ const struct cred *override_creds (const struct cred *new) { -const struct cred *old = current->cred; +const struct cred *old;kdebug ("override_creds(%p{%ld})" , new,atomic_long_read (&new->usage));
@@ -499,7 +499,7 @@ const struct cred *override_creds(const struct cred *new)* visible to other threads under RCU. */ get_new_cred ((struct cred *)new); -rcu_assign_pointer (current->cred, new); + old =override_creds_light (new);kdebug ("override_creds() = %p{%ld}" , old,atomic_long_read (&old->usage));
@@ -521,7 +521,7 @@ void revert_creds(const struct cred *old)kdebug ("revert_creds(%p{%ld})" , old,atomic_long_read (&old->usage)); -rcu_assign_pointer (current->cred, old); +revert_creds_light (old);put_cred (override); }EXPORT_SYMBOL (revert_creds);
Signature · 1 line
2.43.1
RFC v3 4/5 fs: Optimize credentials reference count for backing file ops
In reply to Vinicius Costa GomesFor backing file operations, users are expected to pass credentials that will outlive the backing file common operations.
Use the specialized guard statements to override/revert the credentials.
--- fs/backing-file.c | 27 +++++++-------------------- 1 file changed, 7 insertions(+), 20 deletions(-)
fs/backing-file.c +7 -20
@@ -140,7 +140,6 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter, struct backing_file_ctx *ctx) {struct backing_aio *aio =NULL ; -const struct cred *old_cred;ssize_t ret;if (WARN_ON_ONCE (!(file->f_mode &FMODE_BACKING )))
@@ -153,7 +152,7 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter, !(file->f_mode & FMODE_CAN_ODIRECT))return -EINVAL ; - old_cred =override_creds (ctx->cred); +guard (cred)(ctx->cred);if (is_sync_kiocb (iocb)) {rwf_t rwf =iocb_to_rw_flags (flags);
@@ -174,8 +173,6 @@ ssize_t backing_file_read_iter(struct file *file, struct iov_iter *iter,backing_aio_cleanup (aio, ret); } out: -revert_creds (old_cred); -if (ctx->accessed) ctx->accessed (ctx->user_file);
@@ -187,7 +184,6 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter, struct kiocb *iocb, int flags, struct backing_file_ctx *ctx) { - const struct cred *old_cred; ssize_t ret;if (WARN_ON_ONCE (!(file->f_mode &FMODE_BACKING )))
@@ -210,7 +206,7 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,*/ flags &= ~IOCB_DIO_CALLER_COMP ; - old_cred =override_creds (ctx->cred); +guard (cred)(ctx->cred);if (is_sync_kiocb (iocb)) {rwf_t rwf =iocb_to_rw_flags (flags);
@@ -222,12 +218,12 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter, ret =backing_aio_init_wq (iocb);if (ret) - goto out; +return ret; ret = -ENOMEM ; aio =kmem_cache_zalloc (backing_aio_cachep,GFP_KERNEL );if (!aio) - goto out; +return ret; aio->orig_iocb = iocb; aio->end_write = ctx->end_write;
@@ -240,9 +236,6 @@ ssize_t backing_file_write_iter(struct file *file, struct iov_iter *iter,if (ret != -EIOCBQUEUED )backing_aio_cleanup (aio, ret); } -out: -revert_creds (old_cred); -return ret; }EXPORT_SYMBOL_GPL (backing_file_write_iter);
@@ -252,15 +245,13 @@ ssize_t backing_file_splice_read(struct file *in, loff_t *ppos,unsigned int flags, struct backing_file_ctx *ctx) { - const struct cred *old_cred; ssize_t ret;if (WARN_ON_ONCE (!(in->f_mode &FMODE_BACKING )))return -EIO ; - old_cred =override_creds (ctx->cred); +guard (cred)(ctx->cred); ret =vfs_splice_read (in, ppos, pipe, len, flags); -revert_creds (old_cred);if (ctx->accessed) ctx->accessed (ctx->user_file);
@@ -274,7 +265,6 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,unsigned int flags, struct backing_file_ctx *ctx) { - const struct cred *old_cred; ssize_t ret;if (WARN_ON_ONCE (!(out->f_mode &FMODE_BACKING )))
@@ -284,11 +274,10 @@ ssize_t backing_file_splice_write(struct pipe_inode_info *pipe,if (ret)return ret; - old_cred =override_creds (ctx->cred); +guard (cred)(ctx->cred);file_start_write (out); ret =iter_file_splice_write (pipe, out, ppos, len, flags);file_end_write (out); -revert_creds (old_cred);if (ctx->end_write) ctx->end_write (ctx->user_file);
@@ -300,7 +289,6 @@ EXPORT_SYMBOL_GPL(backing_file_splice_write);int backing_file_mmap (struct file *file,struct vm_area_struct *vma,struct backing_file_ctx *ctx) { -const struct cred *old_cred;int ret; if (WARN_ON_ONCE(!(file->f_mode & FMODE_BACKING)) ||
@@ -312,9 +300,8 @@ int backing_file_mmap(struct file *file, struct vm_area_struct *vma,vma_set_file (vma, file); - old_cred =override_creds (ctx->cred); +guard (cred)(ctx->cred); ret =call_mmap (vma->vm_file, vma); -revert_creds (old_cred);if (ctx->accessed) ctx->accessed (ctx->user_file);
Signature · 1 line
2.43.1
RFC v3 5/5 overlayfs: Optimize credentials usage
In reply to Vinicius Costa GomesFile operations in overlayfs also check against the credentials of the mounter task, stored in the superblock, this credentials will outlive most of the operations. For these cases, use the recently introduced guard statements to guarantee that override/revert_creds() are paired.
--- fs/overlayfs/copy_up.c | 4 +-- fs/overlayfs/dir.c | 13 ++++------ fs/overlayfs/file.c | 28 +++++--------------- fs/overlayfs/inode.c | 59 ++++++++++++++++-------------------------- fs/overlayfs/namei.c | 20 ++++---------- fs/overlayfs/readdir.c | 16 +++--------- fs/overlayfs/util.c | 10 +++---- fs/overlayfs/xattrs.c | 33 ++++++++++------------- 8 files changed, 60 insertions(+), 123 deletions(-)
fs/overlayfs/copy_up.c +1 -3
@@ -1180,7 +1180,6 @@ static int ovl_copy_up_one(struct dentry *parent, struct dentry *dentry,static int ovl_copy_up_flags (struct dentry *dentry,int flags) {int err =0 ; -const struct cred *old_cred;bool disconnected = (dentry->d_flags &DCACHE_DISCONNECTED );/*
@@ -1200,7 +1199,7 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)if (err)return err; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb));while (!err) {struct dentry *next;struct dentry *parent =NULL ;
@@ -1225,7 +1224,6 @@ static int ovl_copy_up_flags(struct dentry *dentry, int flags)dput (parent);dput (next); } -revert_creds (old_cred);return err; }
fs/overlayfs/dir.c +5 -8
@@ -684,12 +684,10 @@ static int ovl_symlink(struct mnt_idmap *idmap, struct inode *dir,static int ovl_set_link_redirect (struct dentry *dentry) { -const struct cred *old_cred;int err; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb)); err =ovl_set_redirect (dentry, false); -revert_creds (old_cred);return err; }
@@ -875,7 +873,6 @@ static void ovl_drop_nlink(struct dentry *dentry)static int ovl_do_remove (struct dentry *dentry,bool is_dir) {int err; -const struct cred *old_cred;bool lower_positive =ovl_lower_positive (dentry);LIST_HEAD (list);
@@ -894,12 +891,12 @@ static int ovl_do_remove(struct dentry *dentry, bool is_dir)if (err) goto out; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb));if (!lower_positive) err =ovl_remove_upper (dentry, is_dir, &list);else err =ovl_remove_and_whiteout (dentry, &list); -revert_creds (old_cred); +if (!err) {if (is_dir)clear_nlink (dentry->d_inode);
@@ -1146,7 +1143,7 @@ static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir, goto out; } - old_cred =ovl_override_creds (old->d_sb); + old_cred =override_creds_light (ovl_creds (old->d_sb));if (!list_empty (&list)) { opaquedir =ovl_clear_empty (new, &list);
@@ -1279,7 +1276,7 @@ static int ovl_rename(struct mnt_idmap *idmap, struct inode *olddir, out_unlock:unlock_rename (new_upperdir, old_upperdir); out_revert_creds: -revert_creds (old_cred); +revert_creds_light (old_cred);if (update_nlink)ovl_nlink_end (new);else
fs/overlayfs/file.c +7 -21
@@ -34,7 +34,6 @@ static struct file *ovl_open_realfile(const struct file *file,struct inode *inode =file_inode (file);struct mnt_idmap *real_idmap;struct file *realfile; -const struct cred *old_cred;int flags = file->f_flags |OVL_OPEN_FLAGS ;int acc_mode =ACC_MODE (flags);int err;
@@ -42,7 +41,7 @@ static struct file *ovl_open_realfile(const struct file *file,if (flags &O_APPEND ) acc_mode |=MAY_APPEND ; - old_cred =ovl_override_creds (inode->i_sb); +guard (cred)(ovl_creds (inode->i_sb)); real_idmap =mnt_idmap (realpath->mnt); err =inode_permission (real_idmap, realinode,MAY_OPEN | acc_mode);if (err) {
@@ -54,7 +53,6 @@ static struct file *ovl_open_realfile(const struct file *file, realfile =backing_file_open (&file->f_path, flags, realpath,current_cred ()); } -revert_creds (old_cred); pr_debug("open(%p[%pD2/%c], 0%o) -> (%p, 0%o)\n", file, file, ovl_whatisit(inode, realinode), file->f_flags,
@@ -185,7 +183,6 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence) {struct inode *inode =file_inode (file);struct fd real; -const struct cred *old_cred;loff_t ret;/*
@@ -214,9 +211,8 @@ static loff_t ovl_llseek(struct file *file, loff_t offset, int whence)ovl_inode_lock (inode); real.file->f_pos = file->f_pos; - old_cred =ovl_override_creds (inode->i_sb); +guard (cred)(ovl_creds (inode->i_sb)); ret =vfs_llseek (real.file, offset, whence); -revert_creds (old_cred); file->f_pos = real.file->f_pos;ovl_inode_unlock (inode);
@@ -388,7 +384,6 @@ static ssize_t ovl_splice_write(struct pipe_inode_info *pipe, struct file *out,static int ovl_fsync (struct file *file,loff_t start,loff_t end,int datasync) {struct fd real; -const struct cred *old_cred;int ret; ret =ovl_sync_status (OVL_FS (file_inode (file)->i_sb));
@@ -401,9 +396,8 @@ static int ovl_fsync(struct file *file, loff_t start, loff_t end, int datasync)/* Don't sync lower file for fear of receiving EROFS error */ if (file_inode (real.file) ==ovl_inode_upper (file_inode (file))) { - old_cred =ovl_override_creds (file_inode (file)->i_sb); +guard (cred)(ovl_creds (file_inode (file)->i_sb)); ret =vfs_fsync_range (real.file, start, end, datasync); -revert_creds (old_cred); }fdput (real);
@@ -427,7 +421,6 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len {struct inode *inode =file_inode (file);struct fd real; -const struct cred *old_cred;int ret;inode_lock (inode);
@@ -441,9 +434,8 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenif (ret) goto out_unlock; - old_cred =ovl_override_creds (file_inode (file)->i_sb); +guard (cred)(ovl_creds (file_inode (file)->i_sb)); ret =vfs_fallocate (real.file, mode, offset, len); -revert_creds (old_cred);/* Update size */ ovl_file_modified (file);
@@ -459,16 +451,14 @@ static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t lenstatic int ovl_fadvise (struct file *file,loff_t offset,loff_t len,int advice) {struct fd real; -const struct cred *old_cred;int ret; ret =ovl_real_fdget (file, &real);if (ret)return ret; - old_cred =ovl_override_creds (file_inode (file)->i_sb); +guard (cred)(ovl_creds (file_inode (file)->i_sb)); ret =vfs_fadvise (real.file, offset, len, advice); -revert_creds (old_cred);fdput (real);
@@ -487,7 +477,6 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, {struct inode *inode_out =file_inode (file_out);struct fd real_in, real_out; -const struct cred *old_cred;loff_t ret;inode_lock (inode_out);
@@ -509,7 +498,7 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, goto out_unlock; } - old_cred =ovl_override_creds (file_inode (file_out)->i_sb); +guard (cred)(ovl_creds (file_inode (file_out)->i_sb));switch (op) {case OVL_COPY : ret = vfs_copy_file_range(real_in.file, pos_in,
@@ -527,7 +516,6 @@ static loff_t ovl_copyfile(struct file *file_in, loff_t pos_in, flags);break ; } -revert_creds (old_cred);/* Update size */ ovl_file_modified (file_out);
@@ -579,7 +567,6 @@ static loff_t ovl_remap_file_range(struct file *file_in, loff_t pos_in,static int ovl_flush (struct file *file,fl_owner_t id) {struct fd real; -const struct cred *old_cred;int err; err =ovl_real_fdget (file, &real);
@@ -587,9 +574,8 @@ static int ovl_flush(struct file *file, fl_owner_t id)return err;if (real.file->f_op->flush) { - old_cred =ovl_override_creds (file_inode (file)->i_sb); +guard (cred)(ovl_creds (file_inode (file)->i_sb)); err = real.file->f_op->flush (real.file, id); -revert_creds (old_cred); }fdput (real);
fs/overlayfs/inode.c +22 -37
188 lines not on this page · raw message
fs/overlayfs/namei.c +5 -15
@@ -953,15 +953,11 @@ static int ovl_maybe_validate_verity(struct dentry *dentry)return err;if (!ovl_test_flag (OVL_VERIFIED_DIGEST , inode)) { -const struct cred *old_cred; - - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb)); err =ovl_validate_verity (ofs, &metapath, &datapath);if (err ==0 )ovl_set_flag (OVL_VERIFIED_DIGEST , inode); - -revert_creds (old_cred); }ovl_inode_unlock (inode);
@@ -975,7 +971,6 @@ static int ovl_maybe_lookup_lowerdata(struct dentry *dentry)struct inode *inode =d_inode (dentry);const char *redirect =ovl_lowerdata_redirect (inode);struct ovl_path datapath = {}; -const struct cred *old_cred;int err;if (!redirect ||ovl_dentry_lowerdata (dentry))
@@ -993,9 +988,9 @@ static int ovl_maybe_lookup_lowerdata(struct dentry *dentry)if (ovl_dentry_lowerdata (dentry)) goto out; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb)); err =ovl_lookup_data_layers (dentry, redirect, &datapath); -revert_creds (old_cred); +if (err) goto out_err;
@@ -1030,7 +1025,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) {struct ovl_entry *oe =NULL ; -const struct cred *old_cred;struct ovl_fs *ofs =OVL_FS (dentry->d_sb);struct ovl_entry *poe =OVL_E (dentry->d_parent);struct ovl_entry *roe =OVL_E (dentry->d_sb->s_root);
@@ -1061,7 +1055,7 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,if (dentry->d_name.len > ofs->namelen)return ERR_PTR (-ENAMETOOLONG ); - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb)); upperdir =ovl_dentry_upper (dentry->d_parent);if (upperdir) { d.layer = &ofs->layers[0 ];
@@ -1342,7 +1336,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,ovl_dentry_init_reval (dentry, upperdentry,OVL_I_E (inode)); -revert_creds (old_cred);if (origin_path) {dput (origin_path->dentry);kfree (origin_path);
@@ -1366,7 +1359,6 @@ struct dentry *ovl_lookup(struct inode *dir, struct dentry *dentry,kfree (upperredirect); out:kfree (d.redirect); -revert_creds (old_cred);return ERR_PTR (err); }
@@ -1374,7 +1366,6 @@ bool ovl_lower_positive(struct dentry *dentry) {struct ovl_entry *poe =OVL_E (dentry->d_parent);const struct qstr *name = &dentry->d_name; -const struct cred *old_cred;unsigned int i;bool positive = false;bool done = false;
@@ -1390,7 +1381,7 @@ bool ovl_lower_positive(struct dentry *dentry)if (!ovl_dentry_upper (dentry))return true; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb));/* Positive upper -> have to look up lower to see whether it exists */ for (i =0 ; !done && !positive && i <ovl_numlower (poe); i++) {struct dentry *this;
@@ -1423,7 +1414,6 @@ bool ovl_lower_positive(struct dentry *dentry)dput (this); } } -revert_creds (old_cred);return positive; }
fs/overlayfs/readdir.c +4 -12
@@ -273,9 +273,8 @@ static int ovl_check_whiteouts(const struct path *path, struct ovl_readdir_dataint err;struct ovl_cache_entry *p;struct dentry *dentry, *dir = path->dentry; -const struct cred *old_cred; - old_cred =ovl_override_creds (rdd->dentry->d_sb); +guard (cred)(ovl_creds (rdd->dentry->d_sb)); err =down_write_killable (&dir->d_inode->i_rwsem);if (!err) {
@@ -290,7 +289,6 @@ static int ovl_check_whiteouts(const struct path *path, struct ovl_readdir_data }inode_unlock (dir->d_inode); } -revert_creds (old_cred);return err; }
@@ -753,10 +751,9 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx)struct dentry *dentry = file->f_path.dentry;struct ovl_fs *ofs =OVL_FS (dentry->d_sb);struct ovl_cache_entry *p; -const struct cred *old_cred;int err; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb));if (!ctx->pos)ovl_dir_reset (file);
@@ -808,7 +805,6 @@ static int ovl_iterate(struct file *file, struct dir_context *ctx) } err =0 ; out: -revert_creds (old_cred);return err; }
@@ -856,11 +852,9 @@ static struct file *ovl_dir_open_realfile(const struct file *file, const struct path *realpath) {struct file *res; -const struct cred *old_cred; - old_cred =ovl_override_creds (file_inode (file)->i_sb); +guard (cred)(ovl_creds (file_inode (file)->i_sb)); res =ovl_path_open (realpath,O_RDONLY | (file->f_flags &O_LARGEFILE )); -revert_creds (old_cred);return res; }
@@ -983,11 +977,9 @@ int ovl_check_empty_dir(struct dentry *dentry, struct list_head *list)int err;struct ovl_cache_entry *p, *n;struct rb_root root =RB_ROOT ; -const struct cred *old_cred; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb)); err =ovl_dir_read_merged (dentry, list, &root); -revert_creds (old_cred);if (err)return err;
fs/overlayfs/util.c +3 -7
@@ -1129,7 +1129,6 @@ static void ovl_cleanup_index(struct dentry *dentry)int ovl_nlink_start (struct dentry *dentry) {struct inode *inode =d_inode (dentry); -const struct cred *old_cred;int err;if (WARN_ON (!inode))
@@ -1166,7 +1165,7 @@ int ovl_nlink_start(struct dentry *dentry)if (d_is_dir (dentry) || !ovl_test_flag (OVL_INDEX , inode))return 0 ; - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb));/* * The overlay inode nlink should be incremented/decremented IFF the * upper operation succeeds, along with nlink change of upper inode.
@@ -1174,7 +1173,7 @@ int ovl_nlink_start(struct dentry *dentry)* value relative to the upper inode nlink in an upper inode xattr. */ err =ovl_set_nlink_upper (dentry); -revert_creds (old_cred); +if (err) goto out_drop_write;
@@ -1195,11 +1194,8 @@ void ovl_nlink_end(struct dentry *dentry)ovl_drop_write (dentry);if (ovl_test_flag (OVL_INDEX , inode) && inode->i_nlink ==0 ) { -const struct cred *old_cred; - - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb));ovl_cleanup_index (dentry); -revert_creds (old_cred); }ovl_inode_unlock (inode);
fs/overlayfs/xattrs.c +13 -20
@@ -41,13 +41,11 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const charstruct dentry *upperdentry =ovl_i_dentry_upper (inode);struct dentry *realdentry = upperdentry ?:ovl_dentry_lower (dentry);struct path realpath; -const struct cred *old_cred;if (!value && !upperdentry) {ovl_path_lower (dentry, &realpath); - old_cred =ovl_override_creds (dentry->d_sb); - err =vfs_getxattr (mnt_idmap (realpath.mnt), realdentry, name,NULL ,0 ); -revert_creds (old_cred); +scoped_guard (cred,ovl_creds (dentry->d_sb)) + err = vfs_getxattr(mnt_idmap(realpath.mnt), realdentry, name, NULL, 0);if (err <0 ) goto out; }
@@ -64,15 +62,15 @@ static int ovl_xattr_set(struct dentry *dentry, struct inode *inode, const charif (err) goto out; - old_cred =ovl_override_creds (dentry->d_sb); -if (value) { - err =ovl_do_setxattr (ofs, realdentry, name, value, size, - flags); - }else { -WARN_ON (flags !=XATTR_REPLACE ); - err =ovl_do_removexattr (ofs, realdentry, name); + scoped_guard(cred, ovl_creds(dentry->d_sb)) { +if (value) { + err =ovl_do_setxattr (ofs, realdentry, name, value, size, + flags); + }else { +WARN_ON (flags !=XATTR_REPLACE ); + err =ovl_do_removexattr (ofs, realdentry, name); + } } -revert_creds (old_cred);ovl_drop_write (dentry);/* copy c/mtime */
@@ -85,13 +83,11 @@ static int ovl_xattr_get(struct dentry *dentry, struct inode *inode, const char void *value, size_t size) { ssize_t res; -const struct cred *old_cred;struct path realpath;ovl_i_path_real (inode, &realpath); - old_cred =ovl_override_creds (dentry->d_sb); +guard (cred)(ovl_creds (dentry->d_sb)); res =vfs_getxattr (mnt_idmap (realpath.mnt), realpath.dentry, name, value, size); -revert_creds (old_cred);return res; }
@@ -116,12 +112,10 @@ ssize_t ovl_listxattr(struct dentry *dentry, char *list, size_t size)ssize_t res;size_t len;char *s; -const struct cred *old_cred;size_t prefix_len, name_len; - old_cred =ovl_override_creds (dentry->d_sb); - res =vfs_listxattr (realdentry, list, size); -revert_creds (old_cred); +scoped_guard (cred,ovl_creds (dentry->d_sb)) + res = vfs_listxattr(realdentry, list, size);if (res <=0 || size ==0 )return res;
@@ -268,4 +262,3 @@ const struct xattr_handler * const *ovl_xattr_handlers(struct ovl_fs *ofs)return ofs->config.userxattr ? ovl_user_xattr_handlers : ovl_trusted_xattr_handlers; } -
Signature · 1 line
2.43.1
kernel test robot
build botRe: [RFC v3 5/5] overlayfs: Optimize credentials usage
kernel test robot noticed the following build errors:
Hi Vinicius,
[This is a private test report for your RFC patch.] kernel test robot noticed the following build errors:
[auto build test ERROR on brauner-vfs/vfs.all]
[also build test ERROR on linus/master v6.8-rc4 next-20240216]
[cannot apply to mszeredi-vfs/overlayfs-next mszeredi-vfs/next vfs-idmapping/for-next] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Vinicius-Costa-Gomes/cleanup-Fix-discarded-const-warning-when-defining-lock-guard/20240216-132100 base: https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs.all patch link: https://lore.kernel.org/r/20240216051640.197378-6-vinicius.gomes%40intel.com patch subject: [RFC v3 5/5] overlayfs: Optimize credentials usage config: i386-buildonly-randconfig-003-20240216 (https://download.01.org/0day-ci/archive/20240217/[email protected]/config) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240217/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> fs/overlayfs/file.c:435:3: error: cannot jump from this goto statement to its label
435 | goto out_unlock;
| ^
fs/overlayfs/file.c:437:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
437 | guard(cred)(ovl_creds(file_inode(file)->i_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:210:1: note: expanded from here
210 | __UNIQUE_ID_guard291
| ^
fs/overlayfs/file.c:431:3: error: cannot jump from this goto statement to its label
431 | goto out_unlock;
| ^
fs/overlayfs/file.c:437:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
437 | guard(cred)(ovl_creds(file_inode(file)->i_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:210:1: note: expanded from here
210 | __UNIQUE_ID_guard291
| ^
fs/overlayfs/file.c:498:3: error: cannot jump from this goto statement to its label
498 | goto out_unlock;
| ^
fs/overlayfs/file.c:501:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
501 | guard(cred)(ovl_creds(file_inode(file_out)->i_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:228:1: note: expanded from here
228 | __UNIQUE_ID_guard293
| ^
fs/overlayfs/file.c:493:3: error: cannot jump from this goto statement to its label
493 | goto out_unlock;
| ^
fs/overlayfs/file.c:501:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
501 | guard(cred)(ovl_creds(file_inode(file_out)->i_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:228:1: note: expanded from here
228 | __UNIQUE_ID_guard293
| ^
fs/overlayfs/file.c:488:4: error: cannot jump from this goto statement to its label
488 | goto out_unlock;
| ^
fs/overlayfs/file.c:501:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
501 | guard(cred)(ovl_creds(file_inode(file_out)->i_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
--
>> fs/overlayfs/inode.c:78:4: error: cannot jump from this goto statement to its label
78 | goto out_put_write;
| ^
fs/overlayfs/inode.c:81:3: note: jump bypasses initialization of variable with __attribute__((cleanup))
81 | guard(cred)(ovl_creds(dentry->d_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:244:1: note: expanded from here
244 | __UNIQUE_ID_guard286
| ^
1 error generated.
--
>> fs/overlayfs/namei.c:989:3: error: cannot jump from this goto statement to its label
989 | goto out;
| ^
fs/overlayfs/namei.c:991:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
991 | guard(cred)(ovl_creds(dentry->d_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:237:1: note: expanded from here
237 | __UNIQUE_ID_guard287
| ^
1 error generated.
--
>> fs/overlayfs/dir.c:892:3: error: cannot jump from this goto statement to its label
892 | goto out;
| ^
fs/overlayfs/dir.c:894:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
894 | guard(cred)(ovl_creds(dentry->d_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:25:1: note: expanded from here
25 | __UNIQUE_ID_guard299
| ^
fs/overlayfs/dir.c:888:3: error: cannot jump from this goto statement to its label
888 | goto out;
| ^
fs/overlayfs/dir.c:894:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
894 | guard(cred)(ovl_creds(dentry->d_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:25:1: note: expanded from here
25 | __UNIQUE_ID_guard299
| ^
fs/overlayfs/dir.c:883:4: error: cannot jump from this goto statement to its label
883 | goto out;
| ^
fs/overlayfs/dir.c:894:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
894 | guard(cred)(ovl_creds(dentry->d_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:25:1: note: expanded from here
25 | __UNIQUE_ID_guard299
| ^
3 errors generated.
--
>> fs/overlayfs/util.c:1167:3: error: cannot jump from this goto statement to its label
1167 | goto out_unlock;
| ^
fs/overlayfs/util.c:1172:2: note: jump bypasses initialization of variable with __attribute__((cleanup))
1172 | guard(cred)(ovl_creds(dentry->d_sb));
| ^
include/linux/cleanup.h:164:15: note: expanded from macro 'guard'
164 | CLASS(_name, __UNIQUE_ID(guard))
| ^
include/linux/compiler.h:180:29: note: expanded from macro '__UNIQUE_ID'
180 | #define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
| ^
include/linux/compiler_types.h:84:22: note: expanded from macro '__PASTE'
84 | #define __PASTE(a,b) ___PASTE(a,b)
| ^
include/linux/compiler_types.h:83:23: note: expanded from macro '___PASTE'
83 | #define ___PASTE(a,b) a##b
| ^
<scratch space>:19:1: note: expanded from here
19 | __UNIQUE_ID_guard284
| ^1 error generated.
vim +435 fs/overlayfs/file.c
2f502839e85ab2 Miklos Szeredi 2018-07-18 419
aab8848cee5eca Miklos Szeredi 2018-07-18 420 static long ovl_fallocate(struct file *file, int mode, loff_t offset, loff_t len)
aab8848cee5eca Miklos Szeredi 2018-07-18 421 {
aab8848cee5eca Miklos Szeredi 2018-07-18 422 struct inode *inode = file_inode(file);
aab8848cee5eca Miklos Szeredi 2018-07-18 423 struct fd real;
aab8848cee5eca Miklos Szeredi 2018-07-18 424 int ret;
aab8848cee5eca Miklos Szeredi 2018-07-18 425
23a8ce16419a30 Amir Goldstein 2022-10-17 426 inode_lock(inode);
23a8ce16419a30 Amir Goldstein 2022-10-17 427 /* Update mode */
23a8ce16419a30 Amir Goldstein 2022-10-17 428 ovl_copyattr(inode);
23a8ce16419a30 Amir Goldstein 2022-10-17 429 ret = file_remove_privs(file);
23a8ce16419a30 Amir Goldstein 2022-10-17 430 if (ret)
23a8ce16419a30 Amir Goldstein 2022-10-17 431 goto out_unlock;
23a8ce16419a30 Amir Goldstein 2022-10-17 432
aab8848cee5eca Miklos Szeredi 2018-07-18 433 ret = ovl_real_fdget(file, &real);
aab8848cee5eca Miklos Szeredi 2018-07-18 434 if (ret)
23a8ce16419a30 Amir Goldstein 2022-10-17 @435 goto out_unlock;
aab8848cee5eca Miklos Szeredi 2018-07-18 436
d98e0bce422c37 Vinicius Costa Gomes 2024-02-15 437 guard(cred)(ovl_creds(file_inode(file)->i_sb));
aab8848cee5eca Miklos Szeredi 2018-07-18 438 ret = vfs_fallocate(real.file, mode, offset, len);
aab8848cee5eca Miklos Szeredi 2018-07-18 439
aab8848cee5eca Miklos Szeredi 2018-07-18 440 /* Update size */
c002728f608183 Amir Goldstein 2023-09-27 441 ovl_file_modified(file);
aab8848cee5eca Miklos Szeredi 2018-07-18 442
aab8848cee5eca Miklos Szeredi 2018-07-18 443 fdput(real);
aab8848cee5eca Miklos Szeredi 2018-07-18 444
23a8ce16419a30 Amir Goldstein 2022-10-17 445 out_unlock:
23a8ce16419a30 Amir Goldstein 2022-10-17 446 inode_unlock(inode);
23a8ce16419a30 Amir Goldstein 2022-10-17 447
aab8848cee5eca Miklos Szeredi 2018-07-18 448 return ret;
aab8848cee5eca Miklos Szeredi 2018-07-18 449 }
aab8848cee5eca Miklos Szeredi 2018-07-18 450 Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki