| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <175798064239.349283.7180905633207368855.stgit@frogsfrogsfrogs>
Date: Mon, 15 Sep 2025 17:01:08 -0700
From: "Darrick J. Wong" <djwong@...nel.org>
To: tytso@....edu
Cc: linux-ext4@...r.kernel.org
Subject: [PATCH 8/9] fuse2fs: clean up more boilerplate
From: Darrick J. Wong <djwong@...nel.org>
Clean up these opencoded bits everywhere.
Signed-off-by: "Darrick J. Wong" <djwong@...nel.org>
---
misc/fuse2fs.c | 146 +++++++++++++++++++++++++-------------------------------
1 file changed, 64 insertions(+), 82 deletions(-)
diff --git a/misc/fuse2fs.c b/misc/fuse2fs.c
index b856cc3a6f23ed..23420c23be240c 100644
--- a/misc/fuse2fs.c
+++ b/misc/fuse2fs.c
@@ -437,6 +437,25 @@ static inline errcode_t fuse2fs_write_inode(ext2_filsys fs, ext2_ino_t ino,
sizeof(*inode));
}
+static inline struct fuse2fs *fuse2fs_get(void)
+{
+ struct fuse_context *ctxt = fuse_get_context();
+
+ return ctxt->private_data;
+}
+
+static inline struct fuse2fs_file_handle *
+fuse2fs_get_handle(const struct fuse_file_info *fp)
+{
+ return (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+}
+
+static inline void
+fuse2fs_set_handle(struct fuse_file_info *fp, struct fuse2fs_file_handle *fh)
+{
+ fp->fh = (uintptr_t)fh;
+}
+
static inline ext2_filsys fuse2fs_start(struct fuse2fs *ff)
{
pthread_mutex_lock(&ff->bfl);
@@ -782,8 +801,7 @@ static int check_inum_access(struct fuse2fs *ff, ext2_ino_t ino, int mask)
static void op_destroy(void *p EXT2FS_ATTR((unused)))
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
errcode_t err;
@@ -955,8 +973,7 @@ static void *op_init(struct fuse_conn_info *conn
#endif
)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
FUSE2FS_CHECK_CONTEXT_ABORT(ff);
@@ -1069,8 +1086,7 @@ static int __fuse2fs_file_ino(struct fuse2fs *ff, const char *path,
#if FUSE_VERSION >= FUSE_MAKE_VERSION(3, 0)
if (fp) {
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
if (fh->ino == 0)
return -ESTALE;
@@ -1102,8 +1118,7 @@ static int op_getattr(const char *path, struct stat *statbuf
#endif
)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
ext2_ino_t ino;
int ret = 0;
@@ -1121,8 +1136,7 @@ static int op_getattr(const char *path, struct stat *statbuf
static int op_readlink(const char *path, char *buf, size_t len)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
errcode_t err;
ext2_ino_t ino;
@@ -1377,7 +1391,7 @@ static void fuse2fs_set_extra_isize(struct fuse2fs *ff, ext2_ino_t ino,
static int op_mknod(const char *path, mode_t mode, dev_t dev)
{
struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
ext2_ino_t parent, child;
char *temp_path;
@@ -1506,7 +1520,7 @@ static int op_mknod(const char *path, mode_t mode, dev_t dev)
static int op_mkdir(const char *path, mode_t mode)
{
struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
ext2_ino_t parent, child;
char *temp_path;
@@ -1825,8 +1839,7 @@ static int __op_unlink(struct fuse2fs *ff, const char *path)
static int op_unlink(const char *path)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
int ret;
FUSE2FS_CHECK_CONTEXT(ff);
@@ -1949,8 +1962,7 @@ static int __op_rmdir(struct fuse2fs *ff, const char *path)
static int op_rmdir(const char *path)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
int ret;
FUSE2FS_CHECK_CONTEXT(ff);
@@ -1963,7 +1975,7 @@ static int op_rmdir(const char *path)
static int op_symlink(const char *src, const char *dest)
{
struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
ext2_ino_t parent, child;
char *temp_path;
@@ -2099,8 +2111,7 @@ static int op_rename(const char *from, const char *to
#endif
)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
errcode_t err;
ext2_ino_t from_ino, to_ino, to_dir_ino, from_dir_ino;
@@ -2335,8 +2346,7 @@ static int op_rename(const char *from, const char *to
static int op_link(const char *src, const char *dest)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
char *temp_path;
errcode_t err;
@@ -2480,7 +2490,7 @@ static int get_req_groups(struct fuse2fs *ff, gid_t **gids, size_t *nr_gids)
static int in_file_group(struct fuse_context *ctxt,
const struct ext2_inode_large *inode)
{
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
gid_t *gids = NULL;
size_t i, nr_gids = 0;
gid_t gid = inode_gid(*inode);
@@ -2524,7 +2534,7 @@ static int op_chmod(const char *path, mode_t mode
)
{
struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
errcode_t err;
ext2_ino_t ino;
@@ -2595,7 +2605,7 @@ static int op_chown(const char *path, uid_t owner, gid_t group
)
{
struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
errcode_t err;
ext2_ino_t ino;
@@ -2736,8 +2746,7 @@ static int op_truncate(const char *path, off_t len
#endif
)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_ino_t ino;
int ret = 0;
@@ -2857,7 +2866,7 @@ static int __op_open(struct fuse2fs *ff, const char *path,
}
file->check_flags = check;
- fp->fh = (uintptr_t)file;
+ fuse2fs_set_handle(fp, file);
out:
if (ret)
@@ -2867,8 +2876,7 @@ static int __op_open(struct fuse2fs *ff, const char *path,
static int op_open(const char *path, struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
int ret;
FUSE2FS_CHECK_CONTEXT(ff);
@@ -2882,10 +2890,8 @@ static int op_read(const char *path EXT2FS_ATTR((unused)), char *buf,
size_t len, off_t offset,
struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
ext2_filsys fs;
ext2_file_t efp;
errcode_t err;
@@ -2938,10 +2944,8 @@ static int op_write(const char *path EXT2FS_ATTR((unused)),
const char *buf, size_t len, off_t offset,
struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
ext2_filsys fs;
ext2_file_t efp;
errcode_t err;
@@ -3009,10 +3013,8 @@ static int op_write(const char *path EXT2FS_ATTR((unused)),
static int op_release(const char *path EXT2FS_ATTR((unused)),
struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
ext2_filsys fs;
errcode_t err;
int ret = 0;
@@ -3042,10 +3044,8 @@ static int op_fsync(const char *path EXT2FS_ATTR((unused)),
int datasync EXT2FS_ATTR((unused)),
struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
ext2_filsys fs;
errcode_t err;
int ret = 0;
@@ -3068,8 +3068,7 @@ static int op_fsync(const char *path EXT2FS_ATTR((unused)),
static int op_statfs(const char *path EXT2FS_ATTR((unused)),
struct statvfs *buf)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
uint64_t fsid, *f;
blk64_t overhead, reserved, free;
@@ -3138,8 +3137,7 @@ static int validate_xattr_name(const char *name)
static int op_getxattr(const char *path, const char *key, char *value,
size_t len)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
void *ptr;
size_t plen;
@@ -3212,8 +3210,7 @@ static int copy_names(char *name, char *value EXT2FS_ATTR((unused)),
static int op_listxattr(const char *path, char *names, size_t len)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
struct ext2_xattr_handle *h;
unsigned int bufsz;
@@ -3289,8 +3286,7 @@ static int op_setxattr(const char *path EXT2FS_ATTR((unused)),
const char *key, const char *value,
size_t len, int flags)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
struct ext2_xattr_handle *h;
ext2_ino_t ino;
@@ -3380,8 +3376,7 @@ static int op_setxattr(const char *path EXT2FS_ATTR((unused)),
static int op_removexattr(const char *path, const char *key)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
struct ext2_xattr_handle *h;
void *buf;
@@ -3571,10 +3566,8 @@ static int op_readdir(const char *path EXT2FS_ATTR((unused)),
#endif
)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
errcode_t err;
struct readdir_iter i = {
.ff = ff,
@@ -3611,8 +3604,7 @@ static int op_readdir(const char *path EXT2FS_ATTR((unused)),
static int op_access(const char *path, int mask)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
errcode_t err;
ext2_ino_t ino;
@@ -3639,7 +3631,7 @@ static int op_access(const char *path, int mask)
static int op_create(const char *path, mode_t mode, struct fuse_file_info *fp)
{
struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
ext2_ino_t parent, child;
char *temp_path;
@@ -3770,10 +3762,8 @@ static int op_create(const char *path, mode_t mode, struct fuse_file_info *fp)
static int op_ftruncate(const char *path EXT2FS_ATTR((unused)),
off_t len, struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
ext2_filsys fs;
ext2_file_t efp;
errcode_t err;
@@ -3823,11 +3813,9 @@ static int op_fgetattr(const char *path EXT2FS_ATTR((unused)),
struct stat *statbuf,
struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
@@ -3847,8 +3835,7 @@ static int op_utimens(const char *path, const struct timespec ctv[2]
#endif
)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
struct timespec tv[2];
ext2_filsys fs;
errcode_t err;
@@ -4262,10 +4249,8 @@ static int op_ioctl(const char *path EXT2FS_ATTR((unused)),
struct fuse_file_info *fp,
unsigned int flags EXT2FS_ATTR((unused)), void *data)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
int ret = 0;
FUSE2FS_CHECK_CONTEXT(ff);
@@ -4312,8 +4297,7 @@ static int op_ioctl(const char *path EXT2FS_ATTR((unused)),
static int op_bmap(const char *path, size_t blocksize EXT2FS_ATTR((unused)),
uint64_t *idx)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
+ struct fuse2fs *ff = fuse2fs_get();
ext2_filsys fs;
ext2_ino_t ino;
errcode_t err;
@@ -4566,10 +4550,8 @@ static int op_fallocate(const char *path EXT2FS_ATTR((unused)), int mode,
off_t offset, off_t len,
struct fuse_file_info *fp)
{
- struct fuse_context *ctxt = fuse_get_context();
- struct fuse2fs *ff = (struct fuse2fs *)ctxt->private_data;
- struct fuse2fs_file_handle *fh =
- (struct fuse2fs_file_handle *)(uintptr_t)fp->fh;
+ struct fuse2fs *ff = fuse2fs_get();
+ struct fuse2fs_file_handle *fh = fuse2fs_get_handle(fp);
ext2_filsys fs;
int ret;
Powered by blists - more mailing lists