mirror of
https://github.com/torvalds/linux.git
synced 2024-11-27 06:31:52 +00:00
4d0e9df5e4
To test fault-tolerance of user memory access functions, introduce fault injection to usercopy functions. If a failure is expected return either -EFAULT or the total amount of bytes that were not copied. Signed-off-by: Albert van der Linde <alinde@google.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Reviewed-by: Akinobu Mita <akinobu.mita@gmail.com> Reviewed-by: Alexander Potapenko <glider@google.com> Cc: Al Viro <viro@zeniv.linux.org.uk> Cc: Andrey Konovalov <andreyknvl@google.com> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Borislav Petkov <bp@alien8.de> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Marco Elver <elver@google.com> Cc: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Christoph Hellwig <hch@lst.de> Link: http://lkml.kernel.org/r/20200831171733.955393-3-alinde@google.com Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
93 lines
2.2 KiB
C
93 lines
2.2 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
#include <linux/bitops.h>
|
|
#include <linux/fault-inject-usercopy.h>
|
|
#include <linux/instrumented.h>
|
|
#include <linux/uaccess.h>
|
|
|
|
/* out-of-line parts */
|
|
|
|
#ifndef INLINE_COPY_FROM_USER
|
|
unsigned long _copy_from_user(void *to, const void __user *from, unsigned long n)
|
|
{
|
|
unsigned long res = n;
|
|
might_fault();
|
|
if (!should_fail_usercopy() && likely(access_ok(from, n))) {
|
|
instrument_copy_from_user(to, from, n);
|
|
res = raw_copy_from_user(to, from, n);
|
|
}
|
|
if (unlikely(res))
|
|
memset(to + (n - res), 0, res);
|
|
return res;
|
|
}
|
|
EXPORT_SYMBOL(_copy_from_user);
|
|
#endif
|
|
|
|
#ifndef INLINE_COPY_TO_USER
|
|
unsigned long _copy_to_user(void __user *to, const void *from, unsigned long n)
|
|
{
|
|
might_fault();
|
|
if (should_fail_usercopy())
|
|
return n;
|
|
if (likely(access_ok(to, n))) {
|
|
instrument_copy_to_user(to, from, n);
|
|
n = raw_copy_to_user(to, from, n);
|
|
}
|
|
return n;
|
|
}
|
|
EXPORT_SYMBOL(_copy_to_user);
|
|
#endif
|
|
|
|
/**
|
|
* check_zeroed_user: check if a userspace buffer only contains zero bytes
|
|
* @from: Source address, in userspace.
|
|
* @size: Size of buffer.
|
|
*
|
|
* This is effectively shorthand for "memchr_inv(from, 0, size) == NULL" for
|
|
* userspace addresses (and is more efficient because we don't care where the
|
|
* first non-zero byte is).
|
|
*
|
|
* Returns:
|
|
* * 0: There were non-zero bytes present in the buffer.
|
|
* * 1: The buffer was full of zero bytes.
|
|
* * -EFAULT: access to userspace failed.
|
|
*/
|
|
int check_zeroed_user(const void __user *from, size_t size)
|
|
{
|
|
unsigned long val;
|
|
uintptr_t align = (uintptr_t) from % sizeof(unsigned long);
|
|
|
|
if (unlikely(size == 0))
|
|
return 1;
|
|
|
|
from -= align;
|
|
size += align;
|
|
|
|
if (!user_read_access_begin(from, size))
|
|
return -EFAULT;
|
|
|
|
unsafe_get_user(val, (unsigned long __user *) from, err_fault);
|
|
if (align)
|
|
val &= ~aligned_byte_mask(align);
|
|
|
|
while (size > sizeof(unsigned long)) {
|
|
if (unlikely(val))
|
|
goto done;
|
|
|
|
from += sizeof(unsigned long);
|
|
size -= sizeof(unsigned long);
|
|
|
|
unsafe_get_user(val, (unsigned long __user *) from, err_fault);
|
|
}
|
|
|
|
if (size < sizeof(unsigned long))
|
|
val &= aligned_byte_mask(size);
|
|
|
|
done:
|
|
user_read_access_end();
|
|
return (val == 0);
|
|
err_fault:
|
|
user_read_access_end();
|
|
return -EFAULT;
|
|
}
|
|
EXPORT_SYMBOL(check_zeroed_user);
|