]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ocfs2: add extra flags check in ocfs2_ioctl_move_extents()
authorDmitry Antipov <dmantipov@yandex.ru>
Thu, 9 Oct 2025 10:23:48 +0000 (13:23 +0300)
committerAndrew Morton <akpm@linux-foundation.org>
Wed, 12 Nov 2025 00:48:29 +0000 (16:48 -0800)
In 'ocfs2_ioctl_move_extents()', add extra check whether only actually
supported flags are passed via 'ioctl(..., OCFS2_IOC_MOVE_EXT, ...)',
and reject anything beyond OCFS2_MOVE_EXT_FL_AUTO_DEFRAG and
OCFS2_MOVE_EXT_FL_PART_DEFRAG with -EINVAL. In particular,
OCFS2_MOVE_EXT_FL_COMPLETE may be set by the kernel only and
should never be passed from userspace.

Link: https://lkml.kernel.org/r/20251009102349.181126-1-dmantipov@yandex.ru
Signed-off-by: Dmitry Antipov <dmantipov@yandex.ru>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Jun Piao <piaojun@huawei.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Mark Fasheh <mark@fasheh.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
fs/ocfs2/move_extents.c

index 10923bf7c8b8416a9acf44bb8df3fecb29823079..bc83dc5ab5bd1218cc4b46a4141971ce32ec022b 100644 (file)
@@ -1036,6 +1036,12 @@ int ocfs2_ioctl_move_extents(struct file *filp, void __user *argp)
        if (range.me_threshold > i_size_read(inode))
                range.me_threshold = i_size_read(inode);
 
+       if (range.me_flags & ~(OCFS2_MOVE_EXT_FL_AUTO_DEFRAG |
+                              OCFS2_MOVE_EXT_FL_PART_DEFRAG)) {
+               status = -EINVAL;
+               goto out_free;
+       }
+
        if (range.me_flags & OCFS2_MOVE_EXT_FL_AUTO_DEFRAG) {
                context->auto_defrag = 1;