X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=fs%2Fioctl.c;h=c415668c86d4cc727460ae0f0eb5a6d1f5840f61;hb=b71dbf1032f546bf3efd60fb5d9d0cefd200a508;hp=0f56deb24ce6547c1aaa13e6a731779c09047077;hpb=d761f3ed6e71bcca724a6e9e39efcac65b7b4ac1;p=linux-2.6-block.git

diff --git a/fs/ioctl.c b/fs/ioctl.c
index 0f56deb24ce6..c415668c86d4 100644
--- a/fs/ioctl.c
+++ b/fs/ioctl.c
@@ -568,7 +568,7 @@ static int ioctl_fsthaw(struct file *filp)
 	return thaw_super(sb);
 }
 
-static long ioctl_file_dedupe_range(struct file *file, void __user *arg)
+static int ioctl_file_dedupe_range(struct file *file, void __user *arg)
 {
 	struct file_dedupe_range __user *argp = arg;
 	struct file_dedupe_range *same = NULL;
@@ -582,6 +582,10 @@ static long ioctl_file_dedupe_range(struct file *file, void __user *arg)
 	}
 
 	size = offsetof(struct file_dedupe_range __user, info[count]);
+	if (size > PAGE_SIZE) {
+		ret = -ENOMEM;
+		goto out;
+	}
 
 	same = memdup_user(argp, size);
 	if (IS_ERR(same)) {