X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Flibcfs%2Flinux%2Flinux-module.c;h=54be33aa2d73598b53f00c3cbeb051e8cdcf1d9c;hb=refs%2Fchanges%2F64%2F18964%2F5;hp=998162a469b7a1d54f9fa35ed14e1990c872aeb2;hpb=6869932b552ac705f411de3362f01bd50c1f6f7d;p=fs%2Flustre-release.git

diff --git a/libcfs/libcfs/linux/linux-module.c b/libcfs/libcfs/linux/linux-module.c
index 998162a..54be33a 100644
--- a/libcfs/libcfs/linux/linux-module.c
+++ b/libcfs/libcfs/linux/linux-module.c
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, 2014, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -40,144 +40,138 @@
 
 #define LNET_MINOR 240
 
-int libcfs_ioctl_getdata(char *buf, char *end, void *arg)
+static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)
+{
+	size_t len = sizeof(*data);
+
+	len += (data->ioc_inllen1 + 7) & ~7;
+	len += (data->ioc_inllen2 + 7) & ~7;
+	return len;
+}
+
+static bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
 {
-        struct libcfs_ioctl_hdr   *hdr;
-        struct libcfs_ioctl_data  *data;
-        int err;
-        ENTRY;
+	if (data->ioc_hdr.ioc_len > BIT(30))
+		return true;
 
-        hdr = (struct libcfs_ioctl_hdr *)buf;
-        data = (struct libcfs_ioctl_data *)buf;
+	if (data->ioc_inllen1 > BIT(30))
+		return true;
 
-        err = copy_from_user(buf, (void *)arg, sizeof(*hdr));
-        if (err)
-                RETURN(err);
+	if (data->ioc_inllen2 > BIT(30))
+		return true;
 
-        if (hdr->ioc_version != LIBCFS_IOCTL_VERSION) {
-                CERROR("PORTALS: version mismatch kernel vs application\n");
-                RETURN(-EINVAL);
-        }
+	if (data->ioc_inlbuf1 && !data->ioc_inllen1)
+		return true;
 
-        if (hdr->ioc_len + buf >= end) {
-                CERROR("PORTALS: user buffer exceeds kernel buffer\n");
-                RETURN(-EINVAL);
-        }
+	if (data->ioc_inlbuf2 && !data->ioc_inllen2)
+		return true;
 
+	if (data->ioc_pbuf1 && !data->ioc_plen1)
+		return true;
 
-        if (hdr->ioc_len < sizeof(struct libcfs_ioctl_data)) {
-                CERROR("PORTALS: user buffer too small for ioctl\n");
-                RETURN(-EINVAL);
-        }
+	if (data->ioc_pbuf2 && !data->ioc_plen2)
+		return true;
 
-        err = copy_from_user(buf, (void *)arg, hdr->ioc_len);
-        if (err)
-                RETURN(err);
+	if (data->ioc_plen1 && !data->ioc_pbuf1)
+		return true;
 
-        if (libcfs_ioctl_is_invalid(data)) {
-                CERROR("PORTALS: ioctl not correctly formatted\n");
-                RETURN(-EINVAL);
-        }
+	if (data->ioc_plen2 && !data->ioc_pbuf2)
+		return true;
 
-        if (data->ioc_inllen1)
-                data->ioc_inlbuf1 = &data->ioc_bulk[0];
+	if (libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len)
+		return true;
 
-        if (data->ioc_inllen2)
-                data->ioc_inlbuf2 = &data->ioc_bulk[0] +
-                        size_round(data->ioc_inllen1);
+	if (data->ioc_inllen1 &&
+	    data->ioc_bulk[((data->ioc_inllen1 + 7) & ~7) +
+			     data->ioc_inllen2 - 1] != '\0')
+		return true;
 
-        RETURN(0);
+	return false;
 }
 
-int libcfs_ioctl_popdata(void *arg, void *data, int size)
+int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
 {
-	if (copy_to_user((char *)arg, data, size))
-		return -EFAULT;
-	return 0;
-}
+	ENTRY;
+
+	if (libcfs_ioctl_is_invalid(data)) {
+		CERROR("libcfs ioctl: parameter not correctly formatted\n");
+		RETURN(-EINVAL);
+	}
 
-extern struct cfs_psdev_ops          libcfs_psdev_ops;
+	if (data->ioc_inllen1 != 0)
+		data->ioc_inlbuf1 = &data->ioc_bulk[0];
 
-static int
-libcfs_psdev_open(struct inode * inode, struct file * file)
-{
-	struct libcfs_device_userstate **pdu = NULL;
-	int    rc = 0;
-
-	if (!inode)
-		return (-EINVAL);
-	pdu = (struct libcfs_device_userstate **)&file->private_data;
-	if (libcfs_psdev_ops.p_open != NULL)
-		rc = libcfs_psdev_ops.p_open(0, (void *)pdu);
-	else
-		return (-EPERM);
-	return rc;
+	if (data->ioc_inllen2 != 0)
+		data->ioc_inlbuf2 = &data->ioc_bulk[0] +
+				    cfs_size_round(data->ioc_inllen1);
+
+	RETURN(0);
 }
 
-/* called when closing /dev/device */
-static int
-libcfs_psdev_release(struct inode * inode, struct file * file)
+int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
+			 struct libcfs_ioctl_hdr __user *uhdr)
 {
-	struct libcfs_device_userstate *pdu;
-	int    rc = 0;
-
-	if (!inode)
-		return (-EINVAL);
-	pdu = file->private_data;
-	if (libcfs_psdev_ops.p_close != NULL)
-		rc = libcfs_psdev_ops.p_close(0, (void *)pdu);
-	else
-		rc = -EPERM;
-	return rc;
+	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 (hdr.ioc_len < sizeof(struct libcfs_ioctl_hdr)) {
+		CERROR("libcfs ioctl: user buffer too small for ioctl\n");
+		RETURN(-EINVAL);
+	}
+
+	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);
+	}
+
+	LIBCFS_ALLOC(*hdr_pp, hdr.ioc_len);
+	if (*hdr_pp == NULL)
+		RETURN(-ENOMEM);
+
+	if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len))
+		GOTO(failed, err = -EFAULT);
+
+	RETURN(0);
+failed:
+	LIBCFS_FREE(*hdr_pp, hdr.ioc_len);
+	RETURN(err);
 }
 
-static int
-libcfs_ioctl(struct inode *inode, struct file *file,
-	     unsigned int cmd, unsigned long arg)
+static long
+libcfs_psdev_ioctl(struct file *file, 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);
-	}
-
-	/* Handle platform-dependent IOC requests */
-	switch (cmd) {
-	case IOC_LIBCFS_PANIC:
-		if (!capable (CAP_SYS_BOOT))
-			return (-EPERM);
-		panic("debugctl-invoked panic");
-		return (0);
-	case IOC_LIBCFS_MEMHOG:
-		if (!capable (CAP_SYS_ADMIN))
-			return -EPERM;
-		/* go thought */
+		return -EINVAL;
 	}
 
-	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);
-	else
-		rc = -EPERM;
-	return (rc);
+	return libcfs_ioctl(cmd, (void __user *)arg);
 }
 
 static struct file_operations libcfs_fops = {
-	ioctl:   libcfs_ioctl,
-	open:    libcfs_psdev_open,
-	release: libcfs_psdev_release
+	.owner		= THIS_MODULE,
+	.unlocked_ioctl = libcfs_psdev_ioctl,
 };
 
-cfs_psdev_t libcfs_dev = {
+struct miscdevice libcfs_dev = {
 	LNET_MINOR,
 	"lnet",
 	&libcfs_fops