FAILED: patch "[PATCH] ovl: support the FS_IOC_FS[SG]ETXATTR ioctls" failed to apply to 4.19-stable tree
Subsystems (2)
[email protected]
maintainerThe patch below does not apply to the 4.19-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From b21d9c435f935014d3e3fa6914f2e4fbabb0e94d Mon Sep 17 00:00:00 2001
From: Amir Goldstein <[email protected]>
Date: Sun, 26 May 2019 09:28:25 +0300
Subject: [PATCH] ovl: support the FS_IOC_FS[SG]ETXATTR ioctls
They are the extended version of FS_IOC_FS[SG]ETFLAGS ioctls. xfs_io -c "chattr <flags>" uses the new ioctls for setting flags.
This used to work in kernel pre v4.19, before stacked file ops introduced the ovl_ioctl whitelist.
Reported-by Dave Chinner <[email protected]>
Fixes d1d04ef8572b ("ovl: stack file ops")
Cc <[email protected]> # v4.19
Signed-off-by Amir Goldstein <[email protected]>
Signed-off-by Miklos Szeredi <[email protected]>
fs/overlayfs/file.c +6 -3
@@ -426,7 +426,8 @@ static unsigned int ovl_get_inode_flags(struct inode *inode)return ovl_iflags; } -static long ovl_ioctl_set_flags (struct file *file,unsigned long arg) +static long ovl_ioctl_set_flags (struct file *file,unsigned int cmd, +unsigned long arg) {long ret;struct inode *inode =file_inode (file);
@@ -456,7 +457,7 @@ static long ovl_ioctl_set_flags(struct file *file, unsigned long arg)if (ret) goto unlock; - ret =ovl_real_ioctl (file,FS_IOC_SETFLAGS , arg); + ret =ovl_real_ioctl (file, cmd, arg);ovl_copyflags (ovl_inode_real (inode), inode); unlock:
@@ -474,11 +475,13 @@ static long ovl_ioctl(struct file *file, unsigned int cmd, unsigned long arg)switch (cmd) {case FS_IOC_GETFLAGS : +case FS_IOC_FSGETXATTR : ret =ovl_real_ioctl (file, cmd, arg);break ;case FS_IOC_SETFLAGS : - ret =ovl_ioctl_set_flags (file, arg); +case FS_IOC_FSSETXATTR : + ret =ovl_ioctl_set_flags (file, cmd, arg);break ;default :