Commit 3b6b25b5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: comedi: range.c: properly mark up __user pointers 



This is the start of cleaning up the user pointer markings
in the comedi core.

Cc: Ian Abbott <abbotti@mev.co.uk>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2434358a

drivers/staging/comedi/comedi.h

+1 −1
Original line number Diff line number Diff line
@@ -368,7 +368,7 @@ 


	struct comedi_rangeinfo {

		unsigned int range_type;

		void *range_ptr;

		void __user *range_ptr;

	};



	struct comedi_krange {

drivers/staging/comedi/comedi_compat32.c

+1 −2
Original line number Diff line number Diff line
@@ -25,9 +25,8 @@ 
*/



#define __NO_VERSION__

#include "comedi.h"

#include <linux/uaccess.h>



#include "comedi.h"

#include "comedi_compat32.h"



#ifdef CONFIG_COMPAT

drivers/staging/comedi/drivers/comedi_bond.c

+2 −2
Original line number Diff line number Diff line
@@ -87,11 +87,11 @@ Configuration Options: 
 * options that are used with comedi_config.

 */



#include <linux/string.h>

#include <linux/slab.h>

#include "../comedi.h"

#include "../comedilib.h"

#include "../comedidev.h"

#include <linux/string.h>

#include <linux/slab.h>



/* The maxiumum number of channels per subdevice. */

#define MAX_CHANS 256

drivers/staging/comedi/internal.h

+2 −1
Original line number Diff line number Diff line 
/*

 * various internal comedi functions

 */

int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg);

int do_rangeinfo_ioctl(struct comedi_device *dev,

		       struct comedi_rangeinfo __user *arg);

int insn_inval(struct comedi_device *dev, struct comedi_subdevice *s,

	       struct comedi_insn *insn, unsigned int *data);

int comedi_alloc_board_minor(struct device *hardware_device);

drivers/staging/comedi/range.c

+4 −2
Original line number Diff line number Diff line
@@ -21,8 +21,9 @@ 


*/



#include "comedidev.h"

#include <linux/uaccess.h>

#include "comedidev.h"

#include "internal.h"



const struct comedi_lrange range_bipolar10 = { 1, {BIP_RANGE(10)} };

EXPORT_SYMBOL(range_bipolar10);
@@ -50,7 +51,8 @@ EXPORT_SYMBOL(range_unknown); 
	writes:

		n struct comedi_krange structures to rangeinfo->range_ptr

*/

int do_rangeinfo_ioctl(struct comedi_device *dev, struct comedi_rangeinfo *arg)

int do_rangeinfo_ioctl(struct comedi_device *dev,

		       struct comedi_rangeinfo __user *arg)

{

	struct comedi_rangeinfo it;

	int subd, chan;