Commit 5e531f44 authored May 29, 2023 by Luís Henriques Committed by Greg Kroah-Hartman Jun 21, 2023

ocfs2: check new file size on fallocate call

commit 26a6ffff7de5dd369cdb12e38ba11db682f1dec0 upstream.

When changing a file size with fallocate() the new size isn't being
checked.  In particular, the FSIZE ulimit isn't being checked, which makes
fstest generic/228 fail.  Simply adding a call to inode_newsize_ok() fixes
this issue.

Link: https://lkml.kernel.org/r/20230529152645.32680-1-lhenriques@suse.de


Signed-off-by: Luís Henriques <lhenriques@suse.de>
Reviewed-by: Mark Fasheh <mark@fasheh.com>
Reviewed-by: Joseph Qi <joseph.qi@linux.alibaba.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Gang He <ghe@suse.com>
Cc: Jun Piao <piaojun@huawei.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent f6878da3

fs/ocfs2/file.c

+7 −1

Original line number	Diff line number	Diff line
		@@ -2103,14 +2103,20 @@ static long ocfs2_fallocate(struct file *file, int mode, loff_t offset,
		struct ocfs2_space_resv sr;
		int change_size = 1;
		int cmd = OCFS2_IOC_RESVSP64;
		int ret = 0;

		if (mode & ~(FALLOC_FL_KEEP_SIZE \| FALLOC_FL_PUNCH_HOLE))
		return -EOPNOTSUPP;
		if (!ocfs2_writes_unwritten_extents(osb))
		return -EOPNOTSUPP;

		if (mode & FALLOC_FL_KEEP_SIZE)
		if (mode & FALLOC_FL_KEEP_SIZE) {
		change_size = 0;
		} else {
		ret = inode_newsize_ok(inode, offset + len);
		if (ret)
		return ret;
		}

		if (mode & FALLOC_FL_PUNCH_HOLE)
		cmd = OCFS2_IOC_UNRESVSP64;