Commit e49332bd authored by Jesper Juhl's avatar Jesper Juhl Committed by Linus Torvalds
Browse files

[PATCH] misc verify_area cleanups 



There were still a few comments left refering to verify_area, and two
functions, verify_area_skas & verify_area_tt that just wrap corresponding
access_ok_skas & access_ok_tt functions, just like verify_area does for
access_ok - deprecate those.

There was also a few places that still used verify_area in commented-out
code, fix those up to use access_ok.

After applying this one there should not be anything left but finally
removing verify_area completely, which will happen after a kernel release
or two.

Signed-off-by: default avatarJesper Juhl <juhl-lkml@dif.dk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a71c1ab5

arch/i386/kernel/vm86.c

+1 −1
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ asmlinkage int sys_vm86(struct pt_regs regs) 
			goto out;

		case VM86_PLUS_INSTALL_CHECK:

			/* NOTE: on old vm86 stuff this will return the error

			   from verify_area(), because the subfunction is

			   from access_ok(), because the subfunction is

			   interpreted as (invalid) address to vm86_struct.

			   So the installation check works.

			 */

arch/um/kernel/skas/include/uaccess-skas.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
	  ((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \

	  ((unsigned long) (addr) + (size) >= (unsigned long)(addr))))



static inline int verify_area_skas(int type, const void * addr,

static inline int __deprecated verify_area_skas(int type, const void * addr,

				   unsigned long size)

{

	return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);

arch/um/kernel/tt/include/uaccess-tt.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ extern unsigned long uml_physmem; 
         (((unsigned long) (addr) <= ((unsigned long) (addr) + (size))) && \

          (under_task_size(addr, size) || is_stack(addr, size))))



static inline int verify_area_tt(int type, const void * addr,

static inline int __deprecated verify_area_tt(int type, const void * addr,

				 unsigned long size)

{

	return(access_ok_tt(type, addr, size) ? 0 : -EFAULT);

drivers/char/dtlk.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define KERNEL

#include <linux/types.h>

#include <linux/fs.h>

#include <linux/mm.h>		/* for verify_area */

#include <linux/mm.h>

#include <linux/errno.h>	/* for -EBUSY */

#include <linux/ioport.h>	/* for request_region */

#include <linux/delay.h>	/* for loops_per_jiffy */

drivers/char/specialix.c

+4 −7
Original line number Diff line number Diff line
@@ -1987,10 +1987,9 @@ static inline int sx_set_serial_info(struct specialix_port * port, 


	func_enter();

	/*

	error = verify_area(VERIFY_READ, (void *) newinfo, sizeof(tmp));

	if (error) {

	if (!access_ok(VERIFY_READ, (void *) newinfo, sizeof(tmp))) {

		func_exit();

		return error;

		return -EFAULT;

	}

	*/

	if (copy_from_user(&tmp, newinfo, sizeof(tmp))) {
@@ -2046,14 +2045,12 @@ static inline int sx_get_serial_info(struct specialix_port * port, 
{

	struct serial_struct tmp;

	struct specialix_board *bp = port_Board(port);

	//	int error;

	

	func_enter();



	/*

	error = verify_area(VERIFY_WRITE, (void *) retinfo, sizeof(tmp));

	if (error)

		return error;

	if (!access_ok(VERIFY_WRITE, (void *) retinfo, sizeof(tmp)))

		return -EFAULT;

	*/



	memset(&tmp, 0, sizeof(tmp));