X-Git-Url: https://git.whamcloud.com/?p=fs%2Flustre-release.git;a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-module.c;h=7175e445fbe522e6a60d1592ab3f0048f35777fe;hp=5b0b2d3a01c22e98500216ac2b112588daa93058;hb=2bcfce77a2712960fadac2f034c1df4826780608;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70

diff --git a/libcfs/libcfs/linux/linux-module.c b/libcfs/libcfs/linux/linux-module.c
index 5b0b2d3..7175e44 100644
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -27,7 +27,7 @@
  * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  *
- * Copyright (c) 2012, Whamcloud, Inc.
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,64 +40,66 @@
 
 #define LNET_MINOR 240
 
-int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
+int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
 {
-        struct libcfs_ioctl_hdr   *hdr;
-        struct libcfs_ioctl_data  *data;
-        int err;
-        ENTRY;
+	ENTRY;
 
-        hdr = (struct libcfs_ioctl_hdr *)buf;
-        data = (struct libcfs_ioctl_data *)buf;
-
-        err = copy_from_user(buf, (void *)arg, sizeof(*hdr));
-        if (err)
-                RETURN(err);
-
-        if (hdr->ioc_version != LIBCFS_IOCTL_VERSION) {
-                CERROR("PORTALS: version mismatch kernel vs application\n");
-                RETURN(-EINVAL);
-        }
+	if (libcfs_ioctl_is_invalid(data)) {
+		CERROR("libcfs ioctl: parameter not correctly formatted\n");
+		RETURN(-EINVAL);
+	}
 
-        if (hdr->ioc_len + buf >= end) {
-                CERROR("PORTALS: user buffer exceeds kernel buffer\n");
-                RETURN(-EINVAL);
-        }
+	if (data->ioc_inllen1 != 0)
+		data->ioc_inlbuf1 = &data->ioc_bulk[0];
 
+	if (data->ioc_inllen2 != 0)
+		data->ioc_inlbuf2 = &data->ioc_bulk[0] +
+				    cfs_size_round(data->ioc_inllen1);
 
-        if (hdr->ioc_len < sizeof(struct libcfs_ioctl_data)) {
-                CERROR("PORTALS: user buffer too small for ioctl\n");
-                RETURN(-EINVAL);
-        }
+	RETURN(0);
+}
 
-        err = copy_from_user(buf, (void *)arg, hdr->ioc_len);
-        if (err)
-                RETURN(err);
+int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
+			 struct libcfs_ioctl_hdr __user *uhdr)
+{
+	struct libcfs_ioctl_hdr   hdr;
+	int err = 0;
+	ENTRY;
+
+	if (copy_from_user(&hdr, uhdr, sizeof(hdr)))
+		RETURN(-EFAULT);
+
+	if (hdr.ioc_version != LIBCFS_IOCTL_VERSION &&
+	    hdr.ioc_version != LIBCFS_IOCTL_VERSION2) {
+		CERROR("libcfs ioctl: version mismatch expected %#x, got %#x\n",
+		       LIBCFS_IOCTL_VERSION, hdr.ioc_version);
+		RETURN(-EINVAL);
+	}
 
-        if (libcfs_ioctl_is_invalid(data)) {
-                CERROR("PORTALS: ioctl not correctly formatted\n");
-                RETURN(-EINVAL);
-        }
+	if (hdr.ioc_len < sizeof(struct libcfs_ioctl_hdr)) {
+		CERROR("libcfs ioctl: user buffer too small for ioctl\n");
+		RETURN(-EINVAL);
+	}
 
-        if (data->ioc_inllen1)
-                data->ioc_inlbuf1 = &data->ioc_bulk[0];
+	if (hdr.ioc_len > LIBCFS_IOC_DATA_MAX) {
+		CERROR("libcfs ioctl: user buffer is too large %d/%d\n",
+		       hdr.ioc_len, LIBCFS_IOC_DATA_MAX);
+		RETURN(-EINVAL);
+	}
 
-        if (data->ioc_inllen2)
-                data->ioc_inlbuf2 = &data->ioc_bulk[0] +
-                        cfs_size_round(data->ioc_inllen1);
+	LIBCFS_ALLOC(*hdr_pp, hdr.ioc_len);
+	if (*hdr_pp == NULL)
+		RETURN(-ENOMEM);
 
-        RETURN(0);
-}
+	if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len))
+		GOTO(failed, err = -EFAULT);
 
-int libcfs_ioctl_popdata(void *arg, void *data, int size)
-{
-	if (copy_to_user((char *)arg, data, size))
-		return -EFAULT;
-	return 0;
+	RETURN(0);
+failed:
+	libcfs_ioctl_freedata(*hdr_pp);
+	RETURN(err);
 }
 
-extern struct cfs_psdev_ops          libcfs_psdev_ops;
-
 static int
 libcfs_psdev_open(struct inode * inode, struct file * file)
 {
@@ -131,24 +133,18 @@ libcfs_psdev_release(struct inode * inode, struct file * file)
 	return rc;
 }
 
-
-#ifdef HAVE_UNLOCKED_IOCTL
 static long libcfs_ioctl(struct file *file,
-                         unsigned int cmd, unsigned long arg)
-#else
-static int  libcfs_ioctl(struct inode *inode, struct file *file,
-                         unsigned int cmd, unsigned long arg)
-#endif
+			 unsigned int cmd, unsigned long arg)
 {
 	struct cfs_psdev_file	 pfile;
 	int    rc = 0;
 
-	if (current_fsuid() != 0)
+	if (!capable(CAP_SYS_ADMIN))
 		return -EACCES;
 
-	if ( _IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
-	     _IOC_NR(cmd) < IOC_LIBCFS_MIN_NR  ||
-	     _IOC_NR(cmd) > IOC_LIBCFS_MAX_NR ) {
+	if (_IOC_TYPE(cmd) != IOC_LIBCFS_TYPE ||
+	    _IOC_NR(cmd) < IOC_LIBCFS_MIN_NR ||
+	    _IOC_NR(cmd) > IOC_LIBCFS_MAX_NR) {
 		CDEBUG(D_IOCTL, "invalid ioctl ( type %d, nr %d, size %d )\n",
 		       _IOC_TYPE(cmd), _IOC_NR(cmd), _IOC_SIZE(cmd));
 		return (-EINVAL);
@@ -170,23 +166,19 @@ static int  libcfs_ioctl(struct inode *inode, struct file *file,
 	pfile.off = 0;
 	pfile.private_data = file->private_data;
 	if (libcfs_psdev_ops.p_ioctl != NULL)
-		rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void *)arg);
+		rc = libcfs_psdev_ops.p_ioctl(&pfile, cmd, (void __user *)arg);
 	else
 		rc = -EPERM;
 	return (rc);
 }
 
 static struct file_operations libcfs_fops = {
-#ifdef HAVE_UNLOCKED_IOCTL
-        unlocked_ioctl: libcfs_ioctl,
-#else
-        ioctl:          libcfs_ioctl,
-#endif
-        open :          libcfs_psdev_open,
-        release :       libcfs_psdev_release
+	unlocked_ioctl: libcfs_ioctl,
+	open :          libcfs_psdev_open,
+	release :       libcfs_psdev_release
 };
 
-cfs_psdev_t libcfs_dev = {
+struct miscdevice libcfs_dev = {
 	LNET_MINOR,
 	"lnet",
 	&libcfs_fops