mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
fuse fixes for 5.12-rc4
-----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQSQHSd0lITzzeNWNm3h3BK/laaZPAUCYFC+9QAKCRDh3BK/laaZ PNUIAQD+g4qznv8fTiN5Juj+qr42DsLAWutI0EdVvZI4UMe01AEAmlLrlHZCE1dM inXPu/Nq+0gMytAlodcOkHFtdOZqpgY= =9izk -----END PGP SIGNATURE----- Merge tag 'fuse-fixes-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse Pull fuse fixes from Miklos Szeredi: "Fix a deadlock and a couple of other bugs" * tag 'fuse-fixes-5.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse: fuse: 32-bit user space ioctl compat for fuse device virtiofs: Fail dax mount if device does not support it fuse: fix live lock in fuse_iget()
This commit is contained in:
commit
1df27313f5
4 changed files with 27 additions and 12 deletions
|
@ -2229,19 +2229,21 @@ static int fuse_device_clone(struct fuse_conn *fc, struct file *new)
|
|||
static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
|
||||
unsigned long arg)
|
||||
{
|
||||
int err = -ENOTTY;
|
||||
int res;
|
||||
int oldfd;
|
||||
struct fuse_dev *fud = NULL;
|
||||
|
||||
if (cmd == FUSE_DEV_IOC_CLONE) {
|
||||
int oldfd;
|
||||
if (_IOC_TYPE(cmd) != FUSE_DEV_IOC_MAGIC)
|
||||
return -ENOTTY;
|
||||
|
||||
err = -EFAULT;
|
||||
if (!get_user(oldfd, (__u32 __user *) arg)) {
|
||||
switch (_IOC_NR(cmd)) {
|
||||
case _IOC_NR(FUSE_DEV_IOC_CLONE):
|
||||
res = -EFAULT;
|
||||
if (!get_user(oldfd, (__u32 __user *)arg)) {
|
||||
struct file *old = fget(oldfd);
|
||||
|
||||
err = -EINVAL;
|
||||
res = -EINVAL;
|
||||
if (old) {
|
||||
struct fuse_dev *fud = NULL;
|
||||
|
||||
/*
|
||||
* Check against file->f_op because CUSE
|
||||
* uses the same ioctl handler.
|
||||
|
@ -2252,14 +2254,18 @@ static long fuse_dev_ioctl(struct file *file, unsigned int cmd,
|
|||
|
||||
if (fud) {
|
||||
mutex_lock(&fuse_mutex);
|
||||
err = fuse_device_clone(fud->fc, file);
|
||||
res = fuse_device_clone(fud->fc, file);
|
||||
mutex_unlock(&fuse_mutex);
|
||||
}
|
||||
fput(old);
|
||||
}
|
||||
}
|
||||
break;
|
||||
default:
|
||||
res = -ENOTTY;
|
||||
break;
|
||||
}
|
||||
return err;
|
||||
return res;
|
||||
}
|
||||
|
||||
const struct file_operations fuse_dev_operations = {
|
||||
|
|
|
@ -863,6 +863,7 @@ static inline u64 fuse_get_attr_version(struct fuse_conn *fc)
|
|||
|
||||
static inline void fuse_make_bad(struct inode *inode)
|
||||
{
|
||||
remove_inode_hash(inode);
|
||||
set_bit(FUSE_I_BAD, &get_fuse_inode(inode)->state);
|
||||
}
|
||||
|
||||
|
|
|
@ -1324,8 +1324,15 @@ static int virtio_fs_fill_super(struct super_block *sb, struct fs_context *fsc)
|
|||
|
||||
/* virtiofs allocates and installs its own fuse devices */
|
||||
ctx->fudptr = NULL;
|
||||
if (ctx->dax)
|
||||
if (ctx->dax) {
|
||||
if (!fs->dax_dev) {
|
||||
err = -EINVAL;
|
||||
pr_err("virtio-fs: dax can't be enabled as filesystem"
|
||||
" device does not support it.\n");
|
||||
goto err_free_fuse_devs;
|
||||
}
|
||||
ctx->dax_dev = fs->dax_dev;
|
||||
}
|
||||
err = fuse_fill_super_common(sb, ctx);
|
||||
if (err < 0)
|
||||
goto err_free_fuse_devs;
|
||||
|
|
|
@ -903,7 +903,8 @@ struct fuse_notify_retrieve_in {
|
|||
};
|
||||
|
||||
/* Device ioctls: */
|
||||
#define FUSE_DEV_IOC_CLONE _IOR(229, 0, uint32_t)
|
||||
#define FUSE_DEV_IOC_MAGIC 229
|
||||
#define FUSE_DEV_IOC_CLONE _IOR(FUSE_DEV_IOC_MAGIC, 0, uint32_t)
|
||||
|
||||
struct fuse_lseek_in {
|
||||
uint64_t fh;
|
||||
|
|
Loading…
Reference in a new issue