Skip to content

Commit

Permalink
revokefs: Use FUSE version 3 if possible
Browse files Browse the repository at this point in the history 
Based on a change contributed by Léo Stefanesco; but instead of
unconditionally using FUSE 3, leave a fallback code path for FUSE 2 for
older distros.

Co-authored-by: Léo Stefanesco <[email protected]>
Signed-off-by: Simon McVittie <[email protected]>
  • Loading branch information
@smcv @ineol @alexlarsson
2 people authored and alexlarsson committed Aug 16, 2022
1 parent 0ff4e6a commit 4018419
Show file tree
Hide file tree
Showing 5 changed files with 111 additions and 15 deletions.
9 changes: 8 additions & 1 deletion configure.ac
View file
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,14 @@ AC_ARG_ENABLE([auto-sideloading],
[enable_auto_sideloading=no])
AM_CONDITIONAL(BUILD_AUTO_SIDELOADING, test x$enable_auto_sideloading = xyes)

PKG_CHECK_MODULES(FUSE, fuse >= 2.9.2)
PKG_CHECK_MODULES([FUSE3], [fuse3 >= 3.1.1],
[
FUSE_USE_VERSION=31
FUSE_CFLAGS="$FUSE3_CFLAGS"
FUSE_LIBS="$FUSE3_LIBS"
],
[PKG_CHECK_MODULES([FUSE], [fuse >= 2.9.2], [FUSE_USE_VERSION=26])])
AC_DEFINE_UNQUOTED([FUSE_USE_VERSION], [$FUSE_USE_VERSION], [Define to the FUSE API version])

AC_ARG_ENABLE([xauth],
AC_HELP_STRING([--disable-xauth],
Expand Down
45 changes: 43 additions & 2 deletions revokefs/main.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
* Boston, MA 02111-1307, USA.
*/

#define FUSE_USE_VERSION 26
#ifndef FUSE_USE_VERSION
#error config.h needs to define FUSE_USE_VERSION
#endif

#include <sys/types.h>
#include <sys/stat.h>
Expand Down Expand Up @@ -60,7 +62,11 @@ ENSURE_RELPATH (const char *path)
}

static int
#if FUSE_USE_VERSION >= 31
callback_getattr (const char *path, struct stat *st_data, struct fuse_file_info *finfo)
#else
callback_getattr (const char *path, struct stat *st_data)
#endif
{
path = ENSURE_RELPATH (path);
if (!*path)
Expand Down Expand Up @@ -94,8 +100,13 @@ callback_readlink (const char *path, char *buf, size_t size)
}

static int
#if FUSE_USE_VERSION >= 31
callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
off_t offset, struct fuse_file_info *fi, enum fuse_readdir_flags flags)
#else
callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
off_t offset, struct fuse_file_info *fi)
#endif
{
DIR *dp;
struct dirent *de;
Expand Down Expand Up @@ -128,8 +139,14 @@ callback_readdir (const char *path, void *buf, fuse_fill_dir_t filler,
memset (&st, 0, sizeof (st));
st.st_ino = de->d_ino;
st.st_mode = de->d_type << 12;

#if FUSE_USE_VERSION >= 31
if (filler (buf, de->d_name, &st, 0, 0))
break;
#else
if (filler (buf, de->d_name, &st, 0))
break;
#endif
}

(void) closedir (dp);
Expand Down Expand Up @@ -185,12 +202,20 @@ callback_symlink (const char *from, const char *to)
}

static int
#if FUSE_USE_VERSION >= 31
callback_rename (const char *from, const char *to, unsigned int flags)
#else
callback_rename (const char *from, const char *to)
#endif
{
#if FUSE_USE_VERSION < 31
unsigned int flags = 0;
#endif

from = ENSURE_RELPATH (from);
to = ENSURE_RELPATH (to);

return request_rename (writer_socket, from, to);
return request_rename (writer_socket, from, to, flags);
}

static int
Expand All @@ -203,28 +228,44 @@ callback_link (const char *from, const char *to)
}

static int
#if FUSE_USE_VERSION >= 31
callback_chmod (const char *path, mode_t mode, struct fuse_file_info *finfo)
#else
callback_chmod (const char *path, mode_t mode)
#endif
{
path = ENSURE_RELPATH (path);
return request_chmod (writer_socket, path, mode);
}

static int
#if FUSE_USE_VERSION >= 31
callback_chown (const char *path, uid_t uid, gid_t gid, struct fuse_file_info *finfo)
#else
callback_chown (const char *path, uid_t uid, gid_t gid)
#endif
{
path = ENSURE_RELPATH (path);
return request_chown (writer_socket, path, uid, gid);
}

static int
#if FUSE_USE_VERSION >= 31
callback_truncate (const char *path, off_t size, struct fuse_file_info *finfo)
#else
callback_truncate (const char *path, off_t size)
#endif
{
path = ENSURE_RELPATH (path);
return request_truncate (writer_socket, path, size);
}

static int
#if FUSE_USE_VERSION >= 31
callback_utimens (const char *path, const struct timespec tv[2], struct fuse_file_info *finfo)
#else
callback_utimens (const char *path, const struct timespec tv[2])
#endif
{
path = ENSURE_RELPATH (path);

Expand Down
24 changes: 17 additions & 7 deletions revokefs/writer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
* Boston, MA 02111-1307, USA.
*/

#ifndef FUSE_USE_VERSION
#error config.h needs to define FUSE_USE_VERSION
#endif

#include <sys/types.h>
#include <sys/stat.h>
#include <sys/statvfs.h>
Expand Down Expand Up @@ -166,7 +170,7 @@ request_path (int writer_socket, RevokefsOps op, const char *path)

static int
request_path_data (int writer_socket, RevokefsOps op, const char *path,
const char *data, size_t data_len)
const char *data, size_t data_len, guint64 flags)
{
RevokefsRequest request = { op };
RevokefsResponse response;
Expand All @@ -177,7 +181,8 @@ request_path_data (int writer_socket, RevokefsOps op, const char *path,
if (total_len > MAX_DATA_SIZE)
return -ENAMETOOLONG;

request.arg1 = strlen(path);
request.arg1 = path_len;
request.arg2 = flags;

response_data_len = do_request (writer_socket, &request, path, path_len, data, data_len,
&response, NULL, 0);
Expand All @@ -190,7 +195,7 @@ request_path_data (int writer_socket, RevokefsOps op, const char *path,
static int
request_path_path (int writer_socket, RevokefsOps op, const char *path1, const char *path2)
{
return request_path_data (writer_socket, op, path1, path2, strlen(path2));
return request_path_data (writer_socket, op, path1, path2, strlen(path2), 0);
}

static gboolean
Expand Down Expand Up @@ -392,10 +397,12 @@ handle_rename (RevokefsRequest *request,
{
g_autofree char *from = NULL;
g_autofree char *to = NULL;
unsigned int flags;

get_valid_2path (request, data_size, &from, &to);
flags = (unsigned int)request->arg2;

if (renameat (basefd, from, basefd, to) == -1)
if (renameat2 (basefd, from, basefd, to, flags) == -1)
response->result = -errno;
else
response->result = 0;
Expand All @@ -404,9 +411,12 @@ handle_rename (RevokefsRequest *request,
}

int
request_rename (int writer_socket, const char *from, const char *to)
request_rename (int writer_socket,
const char *from,
const char *to,
unsigned int flags)
{
return request_path_path (writer_socket, REVOKE_FS_RENAME, from, to);
return request_path_data (writer_socket, REVOKE_FS_RENAME, from, to, strlen (to), flags);
}

static ssize_t
Expand Down Expand Up @@ -515,7 +525,7 @@ int
request_utimens (int writer_socket, const char *path, const struct timespec tv[2])
{
return request_path_data (writer_socket, REVOKE_FS_UTIMENS, path,
(const char *)tv, sizeof (struct timespec) * 2);
(const char *)tv, sizeof (struct timespec) * 2, 0);
}

static ssize_t
Expand Down
2 changes: 1 addition & 1 deletion revokefs/writer.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ int request_rmdir (int writer_socket, const char *path);
int request_unlink (int writer_socket, const char *path);
int request_symlink (int writer_socket, const char *from, const char *to);
int request_link (int writer_socket, const char *from, const char *to);
int request_rename (int writer_socket, const char *from, const char *to);
int request_rename (int writer_socket, const char *from, const char *to, unsigned int flags);
int request_chmod(int writer_socket, const char *path, mode_t mode);
int request_chown(int writer_socket, const char *path, uid_t uid, gid_t gid);
int request_truncate (int writer_socket, const char *path, off_t size);
Expand Down
46 changes: 42 additions & 4 deletions tests/can-use-fuse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,15 @@

#include "libglnx.h"

#define FUSE_USE_VERSION 26
#ifndef FUSE_USE_VERSION
#error config.h needs to define FUSE_USE_VERSION
#endif

#if FUSE_USE_VERSION >= 31
#include <fuse.h>
#else
#include <fuse_lowlevel.h>
#endif

gchar *cannot_use_fuse = NULL;

Expand All @@ -26,10 +33,15 @@ check_fuse (void)
{
g_autofree gchar *fusermount = NULL;
g_autofree gchar *path = NULL;
char *argv[] = { "flatpak-fuse-test" };
struct fuse_args args = FUSE_ARGS_INIT (G_N_ELEMENTS (argv), argv);
struct fuse_chan *chan = NULL;
char *argv[] = { "flatpak-fuse-test", NULL };
struct fuse_args args = FUSE_ARGS_INIT (G_N_ELEMENTS (argv) - 1, argv);
g_autoptr(GError) error = NULL;
#if FUSE_USE_VERSION >= 31
struct fuse *fuse = NULL;
const struct fuse_operations ops = { NULL };
#else
struct fuse_chan *chan = NULL;
#endif

if (cannot_use_fuse != NULL)
return FALSE;
Expand Down Expand Up @@ -64,6 +76,26 @@ check_fuse (void)
path = g_dir_make_tmp ("flatpak-test.XXXXXX", &error);
g_assert_no_error (error);

#if FUSE_USE_VERSION >= 31
fuse = fuse_new (&args, &ops, sizeof (ops), NULL);

if (fuse == NULL)
{
fuse_opt_free_args (&args);
cannot_use_fuse = g_strdup_printf ("fuse_new: %s",
g_strerror (errno));
return FALSE;
}

if (fuse_mount (fuse, path) != 0)
{
fuse_destroy (fuse);
fuse_opt_free_args (&args);
cannot_use_fuse = g_strdup_printf ("fuse_mount: %s",
g_strerror (errno));
return FALSE;
}
#else
chan = fuse_mount (path, &args);

if (chan == NULL)
Expand All @@ -73,10 +105,16 @@ check_fuse (void)
g_strerror (errno));
return FALSE;
}
#endif

g_test_message ("Successfully set up test FUSE fs on %s", path);

#if FUSE_USE_VERSION >= 31
fuse_unmount (fuse);
fuse_destroy (fuse);
#else
fuse_unmount (path, chan);
#endif

if (g_rmdir (path) != 0)
g_error ("rmdir %s: %s", path, g_strerror (errno));
Expand Down

0 comments on commit 4018419

Please sign in to comment.