From: James Simmons <jsimmons@infradead.org>
To: NeilBrown <neilb@suse.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andreas Dilger <andreas.dilger@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>
Subject: Re: [PATCH 09/10] staging: lustre: move remaining code from linux-module.c to module.c
Date: Wed, 2 May 2018 19:13:06 +0100 (BST) [thread overview]
Message-ID: <alpine.LFD.2.21.1805021912550.24633@casper.infradead.org> (raw)
In-Reply-To: <152514675915.17843.13015150157081908310.stgit@noble>
> There is no longer any need to keep this code separate,
> and now we can remove linux-module.c
>
> Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
> ---
> .../staging/lustre/include/linux/libcfs/libcfs.h | 4
> drivers/staging/lustre/lnet/libcfs/Makefile | 1
> .../lustre/lnet/libcfs/linux/linux-module.c | 168 --------------------
> drivers/staging/lustre/lnet/libcfs/module.c | 131 ++++++++++++++++
> 4 files changed, 131 insertions(+), 173 deletions(-)
> delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
>
> diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> index 9263e151451b..d420449b620e 100644
> --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> @@ -138,10 +138,6 @@ struct libcfs_ioctl_handler {
> int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand);
> int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand);
>
> -int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
> - const struct libcfs_ioctl_hdr __user *uparam);
> -int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);
> -
> #define _LIBCFS_H
>
> /**
> diff --git a/drivers/staging/lustre/lnet/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile
> index e6fda27fdabd..e73515789a11 100644
> --- a/drivers/staging/lustre/lnet/libcfs/Makefile
> +++ b/drivers/staging/lustre/lnet/libcfs/Makefile
> @@ -5,7 +5,6 @@ subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
> obj-$(CONFIG_LNET) += libcfs.o
>
> libcfs-linux-objs := linux-tracefile.o linux-debug.o
> -libcfs-linux-objs += linux-module.o
> libcfs-linux-objs += linux-crypto.o
> libcfs-linux-objs += linux-crypto-adler.o
>
> diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
> deleted file mode 100644
> index 954b681f9db7..000000000000
> --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
> +++ /dev/null
> @@ -1,168 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * GPL HEADER START
> - *
> - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 only,
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * General Public License version 2 for more details (a copy is included
> - * in the LICENSE file that accompanied this code).
> - *
> - * You should have received a copy of the GNU General Public License
> - * version 2 along with this program; If not, see
> - * http://www.gnu.org/licenses/gpl-2.0.html
> - *
> - * GPL HEADER END
> - */
> -/*
> - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
> - * Use is subject to license terms.
> - *
> - * Copyright (c) 2012, Intel Corporation.
> - */
> -/*
> - * This file is part of Lustre, http://www.lustre.org/
> - * Lustre is a trademark of Sun Microsystems, Inc.
> - */
> -
> -#define DEBUG_SUBSYSTEM S_LNET
> -
> -#include <linux/miscdevice.h>
> -#include <linux/libcfs/libcfs.h>
> -
> -static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)
> -{
> - size_t len = sizeof(*data);
> -
> - len += cfs_size_round(data->ioc_inllen1);
> - len += cfs_size_round(data->ioc_inllen2);
> - return len;
> -}
> -
> -static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
> -{
> - if (data->ioc_hdr.ioc_len > BIT(30)) {
> - CERROR("LIBCFS ioctl: ioc_len larger than 1<<30\n");
> - return true;
> - }
> - if (data->ioc_inllen1 > BIT(30)) {
> - CERROR("LIBCFS ioctl: ioc_inllen1 larger than 1<<30\n");
> - return true;
> - }
> - if (data->ioc_inllen2 > BIT(30)) {
> - CERROR("LIBCFS ioctl: ioc_inllen2 larger than 1<<30\n");
> - return true;
> - }
> - if (data->ioc_inlbuf1 && !data->ioc_inllen1) {
> - CERROR("LIBCFS ioctl: inlbuf1 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_inlbuf2 && !data->ioc_inllen2) {
> - CERROR("LIBCFS ioctl: inlbuf2 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_pbuf1 && !data->ioc_plen1) {
> - CERROR("LIBCFS ioctl: pbuf1 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_pbuf2 && !data->ioc_plen2) {
> - CERROR("LIBCFS ioctl: pbuf2 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_plen1 && !data->ioc_pbuf1) {
> - CERROR("LIBCFS ioctl: plen1 nonzero but no pbuf1 pointer\n");
> - return true;
> - }
> - if (data->ioc_plen2 && !data->ioc_pbuf2) {
> - CERROR("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n");
> - return true;
> - }
> - if ((u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {
> - CERROR("LIBCFS ioctl: packlen != ioc_len\n");
> - return true;
> - }
> - if (data->ioc_inllen1 &&
> - data->ioc_bulk[data->ioc_inllen1 - 1] != '\0') {
> - CERROR("LIBCFS ioctl: inlbuf1 not 0 terminated\n");
> - return true;
> - }
> - if (data->ioc_inllen2 &&
> - data->ioc_bulk[cfs_size_round(data->ioc_inllen1) +
> - data->ioc_inllen2 - 1] != '\0') {
> - CERROR("LIBCFS ioctl: inlbuf2 not 0 terminated\n");
> - return true;
> - }
> - return false;
> -}
> -
> -int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
> -{
> - if (libcfs_ioctl_is_invalid(data)) {
> - CERROR("libcfs ioctl: parameter not correctly formatted\n");
> - return -EINVAL;
> - }
> -
> - if (data->ioc_inllen1)
> - data->ioc_inlbuf1 = &data->ioc_bulk[0];
> -
> - if (data->ioc_inllen2)
> - data->ioc_inlbuf2 = &data->ioc_bulk[0] +
> - cfs_size_round(data->ioc_inllen1);
> -
> - return 0;
> -}
> -
> -int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
> - const struct libcfs_ioctl_hdr __user *uhdr)
> -{
> - struct libcfs_ioctl_hdr hdr;
> - int err;
> -
> - 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(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;
> - }
> -
> - *hdr_pp = kvmalloc(hdr.ioc_len, GFP_KERNEL);
> - if (!*hdr_pp)
> - return -ENOMEM;
> -
> - if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len)) {
> - err = -EFAULT;
> - goto free;
> - }
> -
> - if ((*hdr_pp)->ioc_version != hdr.ioc_version ||
> - (*hdr_pp)->ioc_len != hdr.ioc_len) {
> - err = -EINVAL;
> - goto free;
> - }
> -
> - return 0;
> -
> -free:
> - kvfree(*hdr_pp);
> - return err;
> -}
> diff --git a/drivers/staging/lustre/lnet/libcfs/module.c b/drivers/staging/lustre/lnet/libcfs/module.c
> index 3fb150a57f49..4c4bf09a78dd 100644
> --- a/drivers/staging/lustre/lnet/libcfs/module.c
> +++ b/drivers/staging/lustre/lnet/libcfs/module.c
> @@ -95,6 +95,137 @@ int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand)
> }
> EXPORT_SYMBOL(libcfs_deregister_ioctl);
>
> +static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)
> +{
> + size_t len = sizeof(*data);
> +
> + len += cfs_size_round(data->ioc_inllen1);
> + len += cfs_size_round(data->ioc_inllen2);
> + return len;
> +}
> +
> +static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
> +{
> + if (data->ioc_hdr.ioc_len > BIT(30)) {
> + CERROR("LIBCFS ioctl: ioc_len larger than 1<<30\n");
> + return true;
> + }
> + if (data->ioc_inllen1 > BIT(30)) {
> + CERROR("LIBCFS ioctl: ioc_inllen1 larger than 1<<30\n");
> + return true;
> + }
> + if (data->ioc_inllen2 > BIT(30)) {
> + CERROR("LIBCFS ioctl: ioc_inllen2 larger than 1<<30\n");
> + return true;
> + }
> + if (data->ioc_inlbuf1 && !data->ioc_inllen1) {
> + CERROR("LIBCFS ioctl: inlbuf1 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_inlbuf2 && !data->ioc_inllen2) {
> + CERROR("LIBCFS ioctl: inlbuf2 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_pbuf1 && !data->ioc_plen1) {
> + CERROR("LIBCFS ioctl: pbuf1 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_pbuf2 && !data->ioc_plen2) {
> + CERROR("LIBCFS ioctl: pbuf2 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_plen1 && !data->ioc_pbuf1) {
> + CERROR("LIBCFS ioctl: plen1 nonzero but no pbuf1 pointer\n");
> + return true;
> + }
> + if (data->ioc_plen2 && !data->ioc_pbuf2) {
> + CERROR("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n");
> + return true;
> + }
> + if ((u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {
> + CERROR("LIBCFS ioctl: packlen != ioc_len\n");
> + return true;
> + }
> + if (data->ioc_inllen1 &&
> + data->ioc_bulk[data->ioc_inllen1 - 1] != '\0') {
> + CERROR("LIBCFS ioctl: inlbuf1 not 0 terminated\n");
> + return true;
> + }
> + if (data->ioc_inllen2 &&
> + data->ioc_bulk[cfs_size_round(data->ioc_inllen1) +
> + data->ioc_inllen2 - 1] != '\0') {
> + CERROR("LIBCFS ioctl: inlbuf2 not 0 terminated\n");
> + return true;
> + }
> + return false;
> +}
> +
> +static int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
> +{
> + if (libcfs_ioctl_is_invalid(data)) {
> + CERROR("libcfs ioctl: parameter not correctly formatted\n");
> + return -EINVAL;
> + }
> +
> + if (data->ioc_inllen1)
> + data->ioc_inlbuf1 = &data->ioc_bulk[0];
> +
> + if (data->ioc_inllen2)
> + data->ioc_inlbuf2 = &data->ioc_bulk[0] +
> + cfs_size_round(data->ioc_inllen1);
> +
> + return 0;
> +}
> +
> +static int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
> + const struct libcfs_ioctl_hdr __user *uhdr)
> +{
> + struct libcfs_ioctl_hdr hdr;
> + int err;
> +
> + 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(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;
> + }
> +
> + *hdr_pp = kvmalloc(hdr.ioc_len, GFP_KERNEL);
> + if (!*hdr_pp)
> + return -ENOMEM;
> +
> + if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len)) {
> + err = -EFAULT;
> + goto free;
> + }
> +
> + if ((*hdr_pp)->ioc_version != hdr.ioc_version ||
> + (*hdr_pp)->ioc_len != hdr.ioc_len) {
> + err = -EINVAL;
> + goto free;
> + }
> +
> + return 0;
> +
> +free:
> + kvfree(*hdr_pp);
> + return err;
> +}
> +
> static int libcfs_ioctl(unsigned long cmd, void __user *uparam)
> {
> struct libcfs_ioctl_data *data = NULL;
>
>
>
WARNING: multiple messages have this Message-ID (diff)
From: James Simmons <jsimmons@infradead.org>
To: NeilBrown <neilb@suse.com>
Cc: Oleg Drokin <oleg.drokin@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andreas Dilger <andreas.dilger@intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Lustre Development List <lustre-devel@lists.lustre.org>
Subject: [lustre-devel] [PATCH 09/10] staging: lustre: move remaining code from linux-module.c to module.c
Date: Wed, 2 May 2018 19:13:06 +0100 (BST) [thread overview]
Message-ID: <alpine.LFD.2.21.1805021912550.24633@casper.infradead.org> (raw)
In-Reply-To: <152514675915.17843.13015150157081908310.stgit@noble>
> There is no longer any need to keep this code separate,
> and now we can remove linux-module.c
>
> Signed-off-by: NeilBrown <neilb@suse.com>
Reviewed-by: James Simmons <jsimmons@infradead.org>
> ---
> .../staging/lustre/include/linux/libcfs/libcfs.h | 4
> drivers/staging/lustre/lnet/libcfs/Makefile | 1
> .../lustre/lnet/libcfs/linux/linux-module.c | 168 --------------------
> drivers/staging/lustre/lnet/libcfs/module.c | 131 ++++++++++++++++
> 4 files changed, 131 insertions(+), 173 deletions(-)
> delete mode 100644 drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
>
> diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs.h b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> index 9263e151451b..d420449b620e 100644
> --- a/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs.h
> @@ -138,10 +138,6 @@ struct libcfs_ioctl_handler {
> int libcfs_register_ioctl(struct libcfs_ioctl_handler *hand);
> int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand);
>
> -int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
> - const struct libcfs_ioctl_hdr __user *uparam);
> -int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data);
> -
> #define _LIBCFS_H
>
> /**
> diff --git a/drivers/staging/lustre/lnet/libcfs/Makefile b/drivers/staging/lustre/lnet/libcfs/Makefile
> index e6fda27fdabd..e73515789a11 100644
> --- a/drivers/staging/lustre/lnet/libcfs/Makefile
> +++ b/drivers/staging/lustre/lnet/libcfs/Makefile
> @@ -5,7 +5,6 @@ subdir-ccflags-y += -I$(srctree)/drivers/staging/lustre/lustre/include
> obj-$(CONFIG_LNET) += libcfs.o
>
> libcfs-linux-objs := linux-tracefile.o linux-debug.o
> -libcfs-linux-objs += linux-module.o
> libcfs-linux-objs += linux-crypto.o
> libcfs-linux-objs += linux-crypto-adler.o
>
> diff --git a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c b/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
> deleted file mode 100644
> index 954b681f9db7..000000000000
> --- a/drivers/staging/lustre/lnet/libcfs/linux/linux-module.c
> +++ /dev/null
> @@ -1,168 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0
> -/*
> - * GPL HEADER START
> - *
> - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License version 2 only,
> - * as published by the Free Software Foundation.
> - *
> - * This program is distributed in the hope that it will be useful, but
> - * WITHOUT ANY WARRANTY; without even the implied warranty of
> - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> - * General Public License version 2 for more details (a copy is included
> - * in the LICENSE file that accompanied this code).
> - *
> - * You should have received a copy of the GNU General Public License
> - * version 2 along with this program; If not, see
> - * http://www.gnu.org/licenses/gpl-2.0.html
> - *
> - * GPL HEADER END
> - */
> -/*
> - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
> - * Use is subject to license terms.
> - *
> - * Copyright (c) 2012, Intel Corporation.
> - */
> -/*
> - * This file is part of Lustre, http://www.lustre.org/
> - * Lustre is a trademark of Sun Microsystems, Inc.
> - */
> -
> -#define DEBUG_SUBSYSTEM S_LNET
> -
> -#include <linux/miscdevice.h>
> -#include <linux/libcfs/libcfs.h>
> -
> -static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)
> -{
> - size_t len = sizeof(*data);
> -
> - len += cfs_size_round(data->ioc_inllen1);
> - len += cfs_size_round(data->ioc_inllen2);
> - return len;
> -}
> -
> -static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
> -{
> - if (data->ioc_hdr.ioc_len > BIT(30)) {
> - CERROR("LIBCFS ioctl: ioc_len larger than 1<<30\n");
> - return true;
> - }
> - if (data->ioc_inllen1 > BIT(30)) {
> - CERROR("LIBCFS ioctl: ioc_inllen1 larger than 1<<30\n");
> - return true;
> - }
> - if (data->ioc_inllen2 > BIT(30)) {
> - CERROR("LIBCFS ioctl: ioc_inllen2 larger than 1<<30\n");
> - return true;
> - }
> - if (data->ioc_inlbuf1 && !data->ioc_inllen1) {
> - CERROR("LIBCFS ioctl: inlbuf1 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_inlbuf2 && !data->ioc_inllen2) {
> - CERROR("LIBCFS ioctl: inlbuf2 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_pbuf1 && !data->ioc_plen1) {
> - CERROR("LIBCFS ioctl: pbuf1 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_pbuf2 && !data->ioc_plen2) {
> - CERROR("LIBCFS ioctl: pbuf2 pointer but 0 length\n");
> - return true;
> - }
> - if (data->ioc_plen1 && !data->ioc_pbuf1) {
> - CERROR("LIBCFS ioctl: plen1 nonzero but no pbuf1 pointer\n");
> - return true;
> - }
> - if (data->ioc_plen2 && !data->ioc_pbuf2) {
> - CERROR("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n");
> - return true;
> - }
> - if ((u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {
> - CERROR("LIBCFS ioctl: packlen != ioc_len\n");
> - return true;
> - }
> - if (data->ioc_inllen1 &&
> - data->ioc_bulk[data->ioc_inllen1 - 1] != '\0') {
> - CERROR("LIBCFS ioctl: inlbuf1 not 0 terminated\n");
> - return true;
> - }
> - if (data->ioc_inllen2 &&
> - data->ioc_bulk[cfs_size_round(data->ioc_inllen1) +
> - data->ioc_inllen2 - 1] != '\0') {
> - CERROR("LIBCFS ioctl: inlbuf2 not 0 terminated\n");
> - return true;
> - }
> - return false;
> -}
> -
> -int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
> -{
> - if (libcfs_ioctl_is_invalid(data)) {
> - CERROR("libcfs ioctl: parameter not correctly formatted\n");
> - return -EINVAL;
> - }
> -
> - if (data->ioc_inllen1)
> - data->ioc_inlbuf1 = &data->ioc_bulk[0];
> -
> - if (data->ioc_inllen2)
> - data->ioc_inlbuf2 = &data->ioc_bulk[0] +
> - cfs_size_round(data->ioc_inllen1);
> -
> - return 0;
> -}
> -
> -int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
> - const struct libcfs_ioctl_hdr __user *uhdr)
> -{
> - struct libcfs_ioctl_hdr hdr;
> - int err;
> -
> - 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(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;
> - }
> -
> - *hdr_pp = kvmalloc(hdr.ioc_len, GFP_KERNEL);
> - if (!*hdr_pp)
> - return -ENOMEM;
> -
> - if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len)) {
> - err = -EFAULT;
> - goto free;
> - }
> -
> - if ((*hdr_pp)->ioc_version != hdr.ioc_version ||
> - (*hdr_pp)->ioc_len != hdr.ioc_len) {
> - err = -EINVAL;
> - goto free;
> - }
> -
> - return 0;
> -
> -free:
> - kvfree(*hdr_pp);
> - return err;
> -}
> diff --git a/drivers/staging/lustre/lnet/libcfs/module.c b/drivers/staging/lustre/lnet/libcfs/module.c
> index 3fb150a57f49..4c4bf09a78dd 100644
> --- a/drivers/staging/lustre/lnet/libcfs/module.c
> +++ b/drivers/staging/lustre/lnet/libcfs/module.c
> @@ -95,6 +95,137 @@ int libcfs_deregister_ioctl(struct libcfs_ioctl_handler *hand)
> }
> EXPORT_SYMBOL(libcfs_deregister_ioctl);
>
> +static inline size_t libcfs_ioctl_packlen(struct libcfs_ioctl_data *data)
> +{
> + size_t len = sizeof(*data);
> +
> + len += cfs_size_round(data->ioc_inllen1);
> + len += cfs_size_round(data->ioc_inllen2);
> + return len;
> +}
> +
> +static inline bool libcfs_ioctl_is_invalid(struct libcfs_ioctl_data *data)
> +{
> + if (data->ioc_hdr.ioc_len > BIT(30)) {
> + CERROR("LIBCFS ioctl: ioc_len larger than 1<<30\n");
> + return true;
> + }
> + if (data->ioc_inllen1 > BIT(30)) {
> + CERROR("LIBCFS ioctl: ioc_inllen1 larger than 1<<30\n");
> + return true;
> + }
> + if (data->ioc_inllen2 > BIT(30)) {
> + CERROR("LIBCFS ioctl: ioc_inllen2 larger than 1<<30\n");
> + return true;
> + }
> + if (data->ioc_inlbuf1 && !data->ioc_inllen1) {
> + CERROR("LIBCFS ioctl: inlbuf1 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_inlbuf2 && !data->ioc_inllen2) {
> + CERROR("LIBCFS ioctl: inlbuf2 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_pbuf1 && !data->ioc_plen1) {
> + CERROR("LIBCFS ioctl: pbuf1 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_pbuf2 && !data->ioc_plen2) {
> + CERROR("LIBCFS ioctl: pbuf2 pointer but 0 length\n");
> + return true;
> + }
> + if (data->ioc_plen1 && !data->ioc_pbuf1) {
> + CERROR("LIBCFS ioctl: plen1 nonzero but no pbuf1 pointer\n");
> + return true;
> + }
> + if (data->ioc_plen2 && !data->ioc_pbuf2) {
> + CERROR("LIBCFS ioctl: plen2 nonzero but no pbuf2 pointer\n");
> + return true;
> + }
> + if ((u32)libcfs_ioctl_packlen(data) != data->ioc_hdr.ioc_len) {
> + CERROR("LIBCFS ioctl: packlen != ioc_len\n");
> + return true;
> + }
> + if (data->ioc_inllen1 &&
> + data->ioc_bulk[data->ioc_inllen1 - 1] != '\0') {
> + CERROR("LIBCFS ioctl: inlbuf1 not 0 terminated\n");
> + return true;
> + }
> + if (data->ioc_inllen2 &&
> + data->ioc_bulk[cfs_size_round(data->ioc_inllen1) +
> + data->ioc_inllen2 - 1] != '\0') {
> + CERROR("LIBCFS ioctl: inlbuf2 not 0 terminated\n");
> + return true;
> + }
> + return false;
> +}
> +
> +static int libcfs_ioctl_data_adjust(struct libcfs_ioctl_data *data)
> +{
> + if (libcfs_ioctl_is_invalid(data)) {
> + CERROR("libcfs ioctl: parameter not correctly formatted\n");
> + return -EINVAL;
> + }
> +
> + if (data->ioc_inllen1)
> + data->ioc_inlbuf1 = &data->ioc_bulk[0];
> +
> + if (data->ioc_inllen2)
> + data->ioc_inlbuf2 = &data->ioc_bulk[0] +
> + cfs_size_round(data->ioc_inllen1);
> +
> + return 0;
> +}
> +
> +static int libcfs_ioctl_getdata(struct libcfs_ioctl_hdr **hdr_pp,
> + const struct libcfs_ioctl_hdr __user *uhdr)
> +{
> + struct libcfs_ioctl_hdr hdr;
> + int err;
> +
> + 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(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;
> + }
> +
> + *hdr_pp = kvmalloc(hdr.ioc_len, GFP_KERNEL);
> + if (!*hdr_pp)
> + return -ENOMEM;
> +
> + if (copy_from_user(*hdr_pp, uhdr, hdr.ioc_len)) {
> + err = -EFAULT;
> + goto free;
> + }
> +
> + if ((*hdr_pp)->ioc_version != hdr.ioc_version ||
> + (*hdr_pp)->ioc_len != hdr.ioc_len) {
> + err = -EINVAL;
> + goto free;
> + }
> +
> + return 0;
> +
> +free:
> + kvfree(*hdr_pp);
> + return err;
> +}
> +
> static int libcfs_ioctl(unsigned long cmd, void __user *uparam)
> {
> struct libcfs_ioctl_data *data = NULL;
>
>
>
next prev parent reply other threads:[~2018-05-02 18:13 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-01 3:52 [PATCH 00/10] staging: lustre: assorted improvements NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 3:52 ` [PATCH 02/10] staging: lustre: make struct lu_site_bkt_data private NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 4:10 ` Dilger, Andreas
2018-05-01 4:10 ` Dilger, Andreas
2018-05-02 3:02 ` James Simmons
2018-05-02 3:02 ` [lustre-devel] " James Simmons
2018-05-03 23:39 ` NeilBrown
2018-05-03 23:39 ` [lustre-devel] " NeilBrown
2018-05-07 1:42 ` Greg Kroah-Hartman
2018-05-07 1:42 ` [lustre-devel] " Greg Kroah-Hartman
2018-05-01 3:52 ` [PATCH 01/10] staging: lustre: ldlm: store name directly in namespace NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 4:04 ` Dilger, Andreas
2018-05-01 4:04 ` [lustre-devel] " Dilger, Andreas
2018-05-02 18:11 ` James Simmons
2018-05-02 18:11 ` [lustre-devel] " James Simmons
2018-05-01 3:52 ` [PATCH 03/10] staging: lustre: lu_object: discard extra lru count NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 4:19 ` Dilger, Andreas
2018-05-01 4:19 ` [lustre-devel] " Dilger, Andreas
2018-05-04 0:08 ` NeilBrown
2018-05-04 0:08 ` [lustre-devel] " NeilBrown
2018-05-01 3:52 ` [PATCH 07/10] staging: lustre: llite: remove redundant lookup in dump_pgcache NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 3:52 ` [PATCH 08/10] staging: lustre: move misc-device registration closer to related code NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-02 18:12 ` James Simmons
2018-05-02 18:12 ` [lustre-devel] " James Simmons
2018-05-01 3:52 ` [PATCH 04/10] staging: lustre: lu_object: move retry logic inside htable_lookup NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 8:22 ` Dilger, Andreas
2018-05-01 8:22 ` Dilger, Andreas
2018-05-02 18:21 ` James Simmons
2018-05-02 18:21 ` James Simmons
2018-05-04 0:30 ` NeilBrown
2018-05-04 0:30 ` NeilBrown
2018-05-04 1:30 ` NeilBrown
2018-05-04 1:30 ` NeilBrown
2018-05-01 3:52 ` [PATCH 05/10] staging: lustre: fold lu_object_new() into lu_object_find_at() NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 3:52 ` [PATCH 10/10] staging: lustre: fix error deref in ll_splice_alias() NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-02 3:05 ` James Simmons
2018-05-02 3:05 ` [lustre-devel] " James Simmons
2018-05-04 0:34 ` NeilBrown
2018-05-04 0:34 ` [lustre-devel] " NeilBrown
2018-05-01 3:52 ` [PATCH 06/10] staging: lustre: llite: use more private data in dump_pgcache NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-01 3:52 ` [PATCH 09/10] staging: lustre: move remaining code from linux-module.c to module.c NeilBrown
2018-05-01 3:52 ` [lustre-devel] " NeilBrown
2018-05-02 18:13 ` James Simmons [this message]
2018-05-02 18:13 ` James Simmons
2018-05-07 0:54 [PATCH 00/10 - v2] staging: lustre: assorted improvements NeilBrown
2018-05-07 0:54 ` [PATCH 09/10] staging: lustre: move remaining code from linux-module.c to module.c NeilBrown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.LFD.2.21.1805021912550.24633@casper.infradead.org \
--to=jsimmons@infradead.org \
--cc=andreas.dilger@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lustre-devel@lists.lustre.org \
--cc=neilb@suse.com \
--cc=oleg.drokin@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.