commit 457712a0bc5389b75d2c93840a684fd77df2aabb
author Sage Weil <sage@inktank.com> Mon Sep 24 21:04:57 2012 -0700
committer Alex Elder <elder@inktank.com> Wed Oct 03 10:51:17 2012 -0500
tree 465703170a567b747a1e642a6a80332e0bdbf1f1
parent 6cae3717cddaf8e5e96e304733dca66e40d56f89

ceph: return EIO on invalid layout on GET_DATALOC ioctl

If the user calls GET_DATALOC on a file with an invalid (e.g.,
zeroed) layout, return EIO to userland.

Signed-off-by: Sage Weil <sage@inktank.com>
Reviewed-by: Alex Elder <elder@inktank.com>

fs/ceph/ioctl.c

diff --git a/fs/ceph/ioctl.c b/fs/ceph/ioctl.c
index 1396ceb..36549a4 100644
--- a/fs/ceph/ioctl.c
+++ b/fs/ceph/ioctl.c
@@ -187,14 +187,18 @@
 	u64 tmp;
 	struct ceph_object_layout ol;
 	struct ceph_pg pgid;
+	int r;
 
 	/* copy and validate */
 	if (copy_from_user(&dl, arg, sizeof(dl)))
 		return -EFAULT;
 
 	down_read(&osdc->map_sem);
-	ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
-				      &dl.object_no, &dl.object_offset, &olen);
+	r = ceph_calc_file_object_mapping(&ci->i_layout, dl.file_offset, &len,
+					  &dl.object_no, &dl.object_offset,
+					  &olen);
+	if (r < 0)
+		return -EIO;
 	dl.file_offset -= dl.object_offset;
 	dl.object_size = ceph_file_layout_object_size(ci->i_layout);
 	dl.block_size = ceph_file_layout_su(ci->i_layout);