Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae664e82 authored by Liang Zhen's avatar Liang Zhen Committed by Greg Kroah-Hartman
Browse files

staging: lustre: libcfs: replace LNET_MAX_IOCTL_BUF_LEN with something bigger 



The size of LNET_MAX_IOCTL_BUF_LEN restricts the size of
libcfs ioctl to the maximum needs of the LNet layer. Since
libcfs also handles things like debugging we might need
to let user land pass more data to or from the kernel than
what is possible

Signed-off-by: default avatarLiang Zhen <liang.zhen@intel.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-5435
Reviewed-on: http://review.whamcloud.com/11313


Reviewed-by: default avatarBobi Jam <bobijam@gmail.com>
Reviewed-by: default avatarJohann Lombardi <johann.lombardi@intel.com>
Reviewed-by: default avatarOleg Drokin <oleg.drokin@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7e221b60

drivers/staging/lustre/include/linux/libcfs/libcfs_ioctl.h

+3 −0
Original line number Diff line number Diff line
@@ -49,6 +49,9 @@ struct libcfs_ioctl_hdr { 
	__u32 ioc_version;

};



/** max size to copy from userspace */

#define LIBCFS_IOC_DATA_MAX	(128 * 1024)



struct libcfs_ioctl_data {

	struct libcfs_ioctl_hdr ioc_hdr;

drivers/staging/lustre/lnet/libcfs/module.c

+1 −4
Original line number Diff line number Diff line
@@ -54,9 +54,6 @@ 


# define DEBUG_SUBSYSTEM S_LNET



#define LNET_MAX_IOCTL_BUF_LEN (sizeof(struct lnet_ioctl_net_config) + \

				sizeof(struct lnet_ioctl_config_data))



#include "../../include/linux/libcfs/libcfs.h"

#include <asm/div64.h>
@@ -186,7 +183,7 @@ static int libcfs_ioctl(struct cfs_psdev_file *pfile, unsigned long cmd, 
	 * do a check here to restrict the size of the memory

	 * to allocate to guard against DoS attacks.

	 */

	if (buf_len > LNET_MAX_IOCTL_BUF_LEN) {

	if (buf_len > LIBCFS_IOC_DATA_MAX) {

		CERROR("LNET: user buffer exceeds kernel buffer\n");

		return -EINVAL;

	}