| Message ID | 20240304191046.157464-25-aalbersh@redhat.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fs-verity support for XFS | expand |
On Mon, Mar 04, 2024 at 08:10:46PM +0100, Andrey Albershteyn wrote: > Add fs-verity ioctls to enable, dump metadata (descriptor and Merkle > tree pages) and obtain file's digest. > > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> > --- > fs/xfs/xfs_ioctl.c | 17 +++++++++++++++++ > 1 file changed, 17 insertions(+) > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > index ab61d7d552fb..4763d20c05ff 100644 > --- a/fs/xfs/xfs_ioctl.c > +++ b/fs/xfs/xfs_ioctl.c > @@ -43,6 +43,7 @@ > #include <linux/mount.h> > #include <linux/namei.h> > #include <linux/fileattr.h> > +#include <linux/fsverity.h> > > /* > * xfs_find_handle maps from userspace xfs_fsop_handlereq structure to > @@ -2174,6 +2175,22 @@ xfs_file_ioctl( > return error; > } > > + case FS_IOC_ENABLE_VERITY: > + if (!xfs_has_verity(mp)) > + return -EOPNOTSUPP; > + return fsverity_ioctl_enable(filp, (const void __user *)arg); Isn't @arg already declared as a (void __user *) ? --D > + > + case FS_IOC_MEASURE_VERITY: > + if (!xfs_has_verity(mp)) > + return -EOPNOTSUPP; > + return fsverity_ioctl_measure(filp, (void __user *)arg); > + > + case FS_IOC_READ_VERITY_METADATA: > + if (!xfs_has_verity(mp)) > + return -EOPNOTSUPP; > + return fsverity_ioctl_read_metadata(filp, > + (const void __user *)arg); > + > default: > return -ENOTTY; > } > -- > 2.42.0 > >
On 2024-03-07 14:14:45, Darrick J. Wong wrote: > On Mon, Mar 04, 2024 at 08:10:46PM +0100, Andrey Albershteyn wrote: > > Add fs-verity ioctls to enable, dump metadata (descriptor and Merkle > > tree pages) and obtain file's digest. > > > > Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> > > --- > > fs/xfs/xfs_ioctl.c | 17 +++++++++++++++++ > > 1 file changed, 17 insertions(+) > > > > diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c > > index ab61d7d552fb..4763d20c05ff 100644 > > --- a/fs/xfs/xfs_ioctl.c > > +++ b/fs/xfs/xfs_ioctl.c > > @@ -43,6 +43,7 @@ > > #include <linux/mount.h> > > #include <linux/namei.h> > > #include <linux/fileattr.h> > > +#include <linux/fsverity.h> > > > > /* > > * xfs_find_handle maps from userspace xfs_fsop_handlereq structure to > > @@ -2174,6 +2175,22 @@ xfs_file_ioctl( > > return error; > > } > > > > + case FS_IOC_ENABLE_VERITY: > > + if (!xfs_has_verity(mp)) > > + return -EOPNOTSUPP; > > + return fsverity_ioctl_enable(filp, (const void __user *)arg); > > Isn't @arg already declared as a (void __user *) ? > > --D > Right, will remove that.
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c index ab61d7d552fb..4763d20c05ff 100644 --- a/fs/xfs/xfs_ioctl.c +++ b/fs/xfs/xfs_ioctl.c @@ -43,6 +43,7 @@ #include <linux/mount.h> #include <linux/namei.h> #include <linux/fileattr.h> +#include <linux/fsverity.h> /* * xfs_find_handle maps from userspace xfs_fsop_handlereq structure to @@ -2174,6 +2175,22 @@ xfs_file_ioctl( return error; } + case FS_IOC_ENABLE_VERITY: + if (!xfs_has_verity(mp)) + return -EOPNOTSUPP; + return fsverity_ioctl_enable(filp, (const void __user *)arg); + + case FS_IOC_MEASURE_VERITY: + if (!xfs_has_verity(mp)) + return -EOPNOTSUPP; + return fsverity_ioctl_measure(filp, (void __user *)arg); + + case FS_IOC_READ_VERITY_METADATA: + if (!xfs_has_verity(mp)) + return -EOPNOTSUPP; + return fsverity_ioctl_read_metadata(filp, + (const void __user *)arg); + default: return -ENOTTY; }
Add fs-verity ioctls to enable, dump metadata (descriptor and Merkle tree pages) and obtain file's digest. Signed-off-by: Andrey Albershteyn <aalbersh@redhat.com> --- fs/xfs/xfs_ioctl.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)