2021-07-02 17:37:45

by Theodore Ts'o

Subject: [PATCH] ext4: fix flags validity checking for EXT4_IOC_CHECKPOINT

Use the correct bitmask when checking for any not-yet-supported flags.

Fixes: 351a0a3fbc35 ("ext4: add ioctl EXT4_IOC_CHECKPOINT")
Signed-off-by: Theodore Ts'o <[email protected]>
Cc: Leah Rumancik <[email protected]>
---
fs/ext4/ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
index 5730aeca563c..6eed6170aded 100644
--- a/fs/ext4/ioctl.c
+++ b/fs/ext4/ioctl.c
@@ -823,7 +823,7 @@ static int ext4_ioctl_checkpoint(struct file *filp, unsigned long arg)
if (!EXT4_SB(sb)->s_journal)
return -ENODEV;

- if (flags & ~JBD2_JOURNAL_FLUSH_VALID)
+ if (flags & ~EXT4_IOC_CHECKPOINT_FLAG_VALID)
return -EINVAL;

q = bdev_get_queue(EXT4_SB(sb)->s_journal->j_dev);
--
2.31.0

2021-07-02 22:47:46

by Leah Rumancik

Subject: Re: [PATCH] ext4: fix flags validity checking for EXT4_IOC_CHECKPOINT

On Fri, Jul 02, 2021 at 01:34:25PM -0400, Theodore Ts'o wrote:
> Use the correct bitmask when checking for any not-yet-supported flags.
>
> Fixes: 351a0a3fbc35 ("ext4: add ioctl EXT4_IOC_CHECKPOINT")
> Signed-off-by: Theodore Ts'o <[email protected]>
> Cc: Leah Rumancik <[email protected]>
> ---
> fs/ext4/ioctl.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c
> index 5730aeca563c..6eed6170aded 100644
> --- a/fs/ext4/ioctl.c
> +++ b/fs/ext4/ioctl.c
> @@ -823,7 +823,7 @@ static int ext4_ioctl_checkpoint(struct file *filp, unsigned long arg)
> if (!EXT4_SB(sb)->s_journal)
> return -ENODEV;
>
> - if (flags & ~JBD2_JOURNAL_FLUSH_VALID)
> + if (flags & ~EXT4_IOC_CHECKPOINT_FLAG_VALID)
> return -EINVAL;
>
> q = bdev_get_queue(EXT4_SB(sb)->s_journal->j_dev);
> --
> 2.31.0
>

Thanks for the fix.

Reviewed-by: Leah Rumancik <[email protected]>

-Leah