* [PATCH] ceph: Check that the new inode size is within limits in ceph_fallocate()
@ 2017-05-05 17:28 Luis Henriques
2017-05-08 2:11 ` Yan, Zheng
0 siblings, 1 reply; 2+ messages in thread
From: Luis Henriques @ 2017-05-05 17:28 UTC (permalink / raw)
To: Yan, Zheng, Sage Weil, Ilya Dryomov
Cc: ceph-devel, linux-kernel, Luis Henriques
Currently the ceph client doesn't respect the rlimit in fallocate. This
means that a user can allocate a file with size > RLIMIT_FSIZE. This
patch adds the call to inode_newsize_ok() to verify filesystem limits and
ulimits. This should make ceph successfully run xfstest generic/228.
Signed-off-by: Luis Henriques <lhenriques@suse.com>
---
fs/ceph/file.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/fs/ceph/file.c b/fs/ceph/file.c
index 26cc95421cca..bc5809d4d2d4 100644
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
@@ -1636,8 +1636,12 @@ static long ceph_fallocate(struct file *file, int mode,
}
size = i_size_read(inode);
- if (!(mode & FALLOC_FL_KEEP_SIZE))
+ if (!(mode & FALLOC_FL_KEEP_SIZE)) {
endoff = offset + length;
+ ret = inode_newsize_ok(inode, endoff);
+ if (ret)
+ goto unlock;
+ }
if (fi->fmode & CEPH_FILE_MODE_LAZY)
want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO;
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] ceph: Check that the new inode size is within limits in ceph_fallocate()
2017-05-05 17:28 [PATCH] ceph: Check that the new inode size is within limits in ceph_fallocate() Luis Henriques
@ 2017-05-08 2:11 ` Yan, Zheng
0 siblings, 0 replies; 2+ messages in thread
From: Yan, Zheng @ 2017-05-08 2:11 UTC (permalink / raw)
To: Luis Henriques
Cc: Yan, Zheng, Sage Weil, Ilya Dryomov, ceph-devel, linux-kernel
On Sat, May 6, 2017 at 1:28 AM, Luis Henriques <lhenriques@suse.com> wrote:
> Currently the ceph client doesn't respect the rlimit in fallocate. This
> means that a user can allocate a file with size > RLIMIT_FSIZE. This
> patch adds the call to inode_newsize_ok() to verify filesystem limits and
> ulimits. This should make ceph successfully run xfstest generic/228.
>
> Signed-off-by: Luis Henriques <lhenriques@suse.com>
> ---
> fs/ceph/file.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/fs/ceph/file.c b/fs/ceph/file.c
> index 26cc95421cca..bc5809d4d2d4 100644
> --- a/fs/ceph/file.c
> +++ b/fs/ceph/file.c
> @@ -1636,8 +1636,12 @@ static long ceph_fallocate(struct file *file, int mode,
> }
>
> size = i_size_read(inode);
> - if (!(mode & FALLOC_FL_KEEP_SIZE))
> + if (!(mode & FALLOC_FL_KEEP_SIZE)) {
> endoff = offset + length;
> + ret = inode_newsize_ok(inode, endoff);
> + if (ret)
> + goto unlock;
> + }
>
> if (fi->fmode & CEPH_FILE_MODE_LAZY)
> want = CEPH_CAP_FILE_BUFFER | CEPH_CAP_FILE_LAZYIO;
> --
Applied, thanks
Yan, Zheng
> To unsubscribe from this list: send the line "unsubscribe ceph-devel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-05-08 2:11 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-05-05 17:28 [PATCH] ceph: Check that the new inode size is within limits in ceph_fallocate() Luis Henriques
2017-05-08 2:11 ` Yan, Zheng
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®