mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-15 06:55:13 +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>
103 lines
2.3 KiB
C
103 lines
2.3 KiB
C
/*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* 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 for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*
|
|
* Copyright (C) IBM Corporation, 2010
|
|
*
|
|
* Author: Anton Blanchard <anton@au.ibm.com>
|
|
*/
|
|
#include <linux/export.h>
|
|
#include <linux/compiler.h>
|
|
#include <linux/types.h>
|
|
#include <asm/checksum.h>
|
|
#include <linux/uaccess.h>
|
|
|
|
__wsum csum_and_copy_from_user(const void __user *src, void *dst,
|
|
int len, __wsum sum, int *err_ptr)
|
|
{
|
|
unsigned int csum;
|
|
|
|
might_sleep();
|
|
|
|
*err_ptr = 0;
|
|
|
|
if (!len) {
|
|
csum = 0;
|
|
goto out;
|
|
}
|
|
|
|
if (unlikely((len < 0) || !access_ok(src, len))) {
|
|
*err_ptr = -EFAULT;
|
|
csum = (__force unsigned int)sum;
|
|
goto out;
|
|
}
|
|
|
|
csum = csum_partial_copy_generic((void __force *)src, dst,
|
|
len, sum, err_ptr, NULL);
|
|
|
|
if (unlikely(*err_ptr)) {
|
|
int missing = __copy_from_user(dst, src, len);
|
|
|
|
if (missing) {
|
|
memset(dst + len - missing, 0, missing);
|
|
*err_ptr = -EFAULT;
|
|
} else {
|
|
*err_ptr = 0;
|
|
}
|
|
|
|
csum = csum_partial(dst, len, sum);
|
|
}
|
|
|
|
out:
|
|
return (__force __wsum)csum;
|
|
}
|
|
EXPORT_SYMBOL(csum_and_copy_from_user);
|
|
|
|
__wsum csum_and_copy_to_user(const void *src, void __user *dst, int len,
|
|
__wsum sum, int *err_ptr)
|
|
{
|
|
unsigned int csum;
|
|
|
|
might_sleep();
|
|
|
|
*err_ptr = 0;
|
|
|
|
if (!len) {
|
|
csum = 0;
|
|
goto out;
|
|
}
|
|
|
|
if (unlikely((len < 0) || !access_ok(dst, len))) {
|
|
*err_ptr = -EFAULT;
|
|
csum = -1; /* invalid checksum */
|
|
goto out;
|
|
}
|
|
|
|
csum = csum_partial_copy_generic(src, (void __force *)dst,
|
|
len, sum, NULL, err_ptr);
|
|
|
|
if (unlikely(*err_ptr)) {
|
|
csum = csum_partial(src, len, sum);
|
|
|
|
if (copy_to_user(dst, src, len)) {
|
|
*err_ptr = -EFAULT;
|
|
csum = -1; /* invalid checksum */
|
|
}
|
|
}
|
|
|
|
out:
|
|
return (__force __wsum)csum;
|
|
}
|
|
EXPORT_SYMBOL(csum_and_copy_to_user);
|