From: John L. Hammond <john.hammond@intel.com>
Date: Mon, 6 May 2013 21:42:32 +0000 (-0500)
Subject: LU-3283 llite: pass correct pointer to obd_iocontrol()
X-Git-Tag: 2.4.90~22
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=0a0a5589d7092b9c276731e6cea3d5d08d0ea27d;p=fs%2Flustre-release.git

LU-3283 llite: pass correct pointer to obd_iocontrol()

In copy_and_ioctl() use the kernel space copy as the karg to
obd_iocontrol().

Signed-off-by: John L. Hammond <john.hammond@intel.com>
Change-Id: I9b714675b4b63737efc08eec1b08463de1d63d1b
Reviewed-on: http://review.whamcloud.com/6274
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Sebastien Buisson <sebastien.buisson@bull.net>
Reviewed-by: Oleg Drokin <oleg.drokin@intel.com>
---

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index 23d2af8..66ca76d 100644
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -1068,21 +1068,26 @@ progress:
 }
 
 
-static int copy_and_ioctl(int cmd, struct obd_export *exp, void *data, int len)
+static int copy_and_ioctl(int cmd, struct obd_export *exp,
+			  const void __user *data, size_t size)
 {
-        void *ptr;
-        int rc;
+	void *copy;
+	int rc;
 
-        OBD_ALLOC(ptr, len);
-        if (ptr == NULL)
-                return -ENOMEM;
-	if (copy_from_user(ptr, data, len)) {
-                OBD_FREE(ptr, len);
-                return -EFAULT;
-        }
-        rc = obd_iocontrol(cmd, exp, len, data, NULL);
-        OBD_FREE(ptr, len);
-        return rc;
+	OBD_ALLOC(copy, size);
+	if (copy == NULL)
+		return -ENOMEM;
+
+	if (copy_from_user(copy, data, size)) {
+		rc = -EFAULT;
+		goto out;
+	}
+
+	rc = obd_iocontrol(cmd, exp, size, copy, NULL);
+out:
+	OBD_FREE(copy, size);
+
+	return rc;
 }
 
 static int quotactl_ioctl(struct ll_sb_info *sbi, struct if_quotactl *qctl)