mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-12 05:48:39 +08:00
96d4f267e4
Nobody has actually used the type (VERIFY_READ vs VERIFY_WRITE) argument
of the user address range verification function since we got rid of the
old racy i386-only code to walk page tables by hand.
It existed because the original 80386 would not honor the write protect
bit when in kernel mode, so you had to do COW by hand before doing any
user access. But we haven't supported that in a long time, and these
days the 'type' argument is a purely historical artifact.
A discussion about extending 'user_access_begin()' to do the range
checking resulted this patch, because there is no way we're going to
move the old VERIFY_xyz interface to that model. And it's best done at
the end of the merge window when I've done most of my merges, so let's
just get this done once and for all.
This patch was mostly done with a sed-script, with manual fix-ups for
the cases that weren't of the trivial 'access_ok(VERIFY_xyz' form.
There were a couple of notable cases:
- csky still had the old "verify_area()" name as an alias.
- the iter_iov code had magical hardcoded knowledge of the actual
values of VERIFY_{READ,WRITE} (not that they mattered, since nothing
really used it)
- microblaze used the type argument for a debug printout
but other than those oddities this should be a total no-op patch.
I tried to fix up all architectures, did fairly extensive grepping for
access_ok() uses, and the changes are trivial, but I may have missed
something. Any missed conversion should be trivially fixable, though.
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
106 lines
2.9 KiB
C
106 lines
2.9 KiB
C
/*
|
|
* This file is subject to the terms and conditions of the GNU General Public
|
|
* License. See the file "COPYING" in the main directory of this archive
|
|
* for more details.
|
|
*
|
|
* Copyright (C) 1995, 1996, 2000, 2001 by Ralf Baechle
|
|
* Copyright (C) 2000, 2001 Silicon Graphics, Inc.
|
|
*/
|
|
#ifndef _ASM_TERMIOS_H
|
|
#define _ASM_TERMIOS_H
|
|
|
|
#include <linux/uaccess.h>
|
|
#include <uapi/asm/termios.h>
|
|
|
|
/*
|
|
* intr=^C quit=^\ erase=del kill=^U
|
|
* vmin=\1 vtime=\0 eol2=\0 swtc=\0
|
|
* start=^Q stop=^S susp=^Z vdsusp=
|
|
* reprint=^R discard=^U werase=^W lnext=^V
|
|
* eof=^D eol=\0
|
|
*/
|
|
#define INIT_C_CC "\003\034\177\025\1\0\0\0\021\023\032\0\022\017\027\026\004\0"
|
|
|
|
#include <linux/string.h>
|
|
|
|
/*
|
|
* Translate a "termio" structure into a "termios". Ugh.
|
|
*/
|
|
static inline int user_termio_to_kernel_termios(struct ktermios *termios,
|
|
struct termio __user *termio)
|
|
{
|
|
unsigned short iflag, oflag, cflag, lflag;
|
|
unsigned int err;
|
|
|
|
if (!access_ok(termio, sizeof(struct termio)))
|
|
return -EFAULT;
|
|
|
|
err = __get_user(iflag, &termio->c_iflag);
|
|
termios->c_iflag = (termios->c_iflag & 0xffff0000) | iflag;
|
|
err |=__get_user(oflag, &termio->c_oflag);
|
|
termios->c_oflag = (termios->c_oflag & 0xffff0000) | oflag;
|
|
err |=__get_user(cflag, &termio->c_cflag);
|
|
termios->c_cflag = (termios->c_cflag & 0xffff0000) | cflag;
|
|
err |=__get_user(lflag, &termio->c_lflag);
|
|
termios->c_lflag = (termios->c_lflag & 0xffff0000) | lflag;
|
|
err |=__get_user(termios->c_line, &termio->c_line);
|
|
if (err)
|
|
return -EFAULT;
|
|
|
|
if (__copy_from_user(termios->c_cc, termio->c_cc, NCC))
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* Translate a "termios" structure into a "termio". Ugh.
|
|
*/
|
|
static inline int kernel_termios_to_user_termio(struct termio __user *termio,
|
|
struct ktermios *termios)
|
|
{
|
|
int err;
|
|
|
|
if (!access_ok(termio, sizeof(struct termio)))
|
|
return -EFAULT;
|
|
|
|
err = __put_user(termios->c_iflag, &termio->c_iflag);
|
|
err |= __put_user(termios->c_oflag, &termio->c_oflag);
|
|
err |= __put_user(termios->c_cflag, &termio->c_cflag);
|
|
err |= __put_user(termios->c_lflag, &termio->c_lflag);
|
|
err |= __put_user(termios->c_line, &termio->c_line);
|
|
if (err)
|
|
return -EFAULT;
|
|
|
|
if (__copy_to_user(termio->c_cc, termios->c_cc, NCC))
|
|
return -EFAULT;
|
|
|
|
return 0;
|
|
}
|
|
|
|
static inline int user_termios_to_kernel_termios(struct ktermios __user *k,
|
|
struct termios2 *u)
|
|
{
|
|
return copy_from_user(k, u, sizeof(struct termios2)) ? -EFAULT : 0;
|
|
}
|
|
|
|
static inline int kernel_termios_to_user_termios(struct termios2 __user *u,
|
|
struct ktermios *k)
|
|
{
|
|
return copy_to_user(u, k, sizeof(struct termios2)) ? -EFAULT : 0;
|
|
}
|
|
|
|
static inline int user_termios_to_kernel_termios_1(struct ktermios *k,
|
|
struct termios __user *u)
|
|
{
|
|
return copy_from_user(k, u, sizeof(struct termios)) ? -EFAULT : 0;
|
|
}
|
|
|
|
static inline int kernel_termios_to_user_termios_1(struct termios __user *u,
|
|
struct ktermios *k)
|
|
{
|
|
return copy_to_user(u, k, sizeof(struct termios)) ? -EFAULT : 0;
|
|
}
|
|
|
|
#endif /* _ASM_TERMIOS_H */
|