1 files changed, 0 insertions, 87 deletions
diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c
index d9b094ca7aaa..ef2a6a5d78e3 100644
--- a/arch/x86/lib/usercopy_32.c
+++ b/arch/x86/lib/usercopy_32.c
@@ -33,93 +33,6 @@ static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned lon
        __movsl_is_ok((unsigned long)(a1), (unsigned long)(a2), (n))
 /*
- * Copy a null terminated string from userspace.
- */
-#define __do_strncpy_from_user(dst, src, count, res)                       \
-do {                                                                       \
-        int __d0, __d1, __d2;                                              \
-        might_fault();                                                     \
-        __asm__ __volatile__(                                              \
-                "       testl %1,%1\n"                                     \
-                "       jz 2f\n"                                           \
-                "0:     lodsb\n"                                           \
-                "       stosb\n"                                           \
-                "       testb %%al,%%al\n"                                 \
-                "       jz 1f\n"                                           \
-                "       decl %1\n"                                         \
-                "       jnz 0b\n"                                          \
-                "1:     subl %1,%0\n"                                      \
-                "2:\n"                                                     \
-                ".section .fixup,\"ax\"\n"                                 \
-                "3:     movl %5,%0\n"                                      \
-                "       jmp 2b\n"                                          \
-                ".previous\n"                                              \
-                _ASM_EXTABLE(0b,3b)                                        \
-                : "=&d"(res), "=&c"(count), "=&a" (__d0), "=&S" (__d1),    \
-                  "=&D" (__d2)                                             \
-                : "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \
-                : "memory");                                               \
-} while (0)
-/**
- * __strncpy_from_user: - Copy a NUL terminated string from userspace, with less checking.
- * @dst:   Destination address, in kernel space.  This buffer must be at
- *         least @count bytes long.
- * @src:   Source address, in user space.
- * @count: Maximum number of bytes to copy, including the trailing NUL.
- *
- * Copies a NUL-terminated string from userspace to kernel space.
- * Caller must check the specified block with access_ok() before calling
- * this function.
- *
- * On success, returns the length of the string (not including the trailing
- * NUL).
- *
- * If access to userspace fails, returns -EFAULT (some data may have been
- * copied).
- *
- * If @count is smaller than the length of the string, copies @count bytes
- * and returns @count.
- */
-long
-__strncpy_from_user(char *dst, const char __user *src, long count)
-{
-        long res;
-        __do_strncpy_from_user(dst, src, count, res);
-        return res;
-}
-EXPORT_SYMBOL(__strncpy_from_user);
-/**
- * strncpy_from_user: - Copy a NUL terminated string from userspace.
- * @dst:   Destination address, in kernel space.  This buffer must be at
- *         least @count bytes long.
- * @src:   Source address, in user space.
- * @count: Maximum number of bytes to copy, including the trailing NUL.
- *
- * Copies a NUL-terminated string from userspace to kernel space.
- *
- * On success, returns the length of the string (not including the trailing
- * NUL).
- *
- * If access to userspace fails, returns -EFAULT (some data may have been
- * copied).
- *
- * If @count is smaller than the length of the string, copies @count bytes
- * and returns @count.
- */
-long
-strncpy_from_user(char *dst, const char __user *src, long count)
-{
-        long res = -EFAULT;
-        if (access_ok(VERIFY_READ, src, 1))
-                __do_strncpy_from_user(dst, src, count, res);
-        return res;
-}
-EXPORT_SYMBOL(strncpy_from_user);
-/*
 * Zero Userspace
 */

diff --git a/arch/x86/lib/usercopy_32.c b/arch/x86/lib/usercopy_32.c index d9b094ca7aaa..ef2a6a5d78e3 100644 --- a/arch/x86/lib/usercopy_32.c +++ b/arch/x86/lib/usercopy_32.c
@@ -33,93 +33,6 @@ static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned lon
33	__movsl_is_ok((unsigned long)(a1), (unsigned long)(a2), (n))	33	__movsl_is_ok((unsigned long)(a1), (unsigned long)(a2), (n))
34		34
35	/*	35	/*
36	* Copy a null terminated string from userspace.
37	*/
38
39	#define __do_strncpy_from_user(dst, src, count, res) \
40	do { \
41	int __d0, __d1, __d2; \
42	might_fault(); \
43	__asm__ __volatile__( \
44	" testl %1,%1\n" \
45	" jz 2f\n" \
46	"0: lodsb\n" \
47	" stosb\n" \
48	" testb %%al,%%al\n" \
49	" jz 1f\n" \
50	" decl %1\n" \
51	" jnz 0b\n" \
52	"1: subl %1,%0\n" \
53	"2:\n" \
54	".section .fixup,\"ax\"\n" \
55	"3: movl %5,%0\n" \
56	" jmp 2b\n" \
57	".previous\n" \
58	_ASM_EXTABLE(0b,3b) \
59	: "=&d"(res), "=&c"(count), "=&a" (__d0), "=&S" (__d1), \
60	"=&D" (__d2) \
61	: "i"(-EFAULT), "0"(count), "1"(count), "3"(src), "4"(dst) \
62	: "memory"); \
63	} while (0)
64
65	/**
66	* __strncpy_from_user: - Copy a NUL terminated string from userspace, with less checking.
67	* @dst: Destination address, in kernel space. This buffer must be at
68	* least @count bytes long.
69	* @src: Source address, in user space.
70	* @count: Maximum number of bytes to copy, including the trailing NUL.
71	*
72	* Copies a NUL-terminated string from userspace to kernel space.
73	* Caller must check the specified block with access_ok() before calling
74	* this function.
75	*
76	* On success, returns the length of the string (not including the trailing
77	* NUL).
78	*
79	* If access to userspace fails, returns -EFAULT (some data may have been
80	* copied).
81	*
82	* If @count is smaller than the length of the string, copies @count bytes
83	* and returns @count.
84	*/
85	long
86	__strncpy_from_user(char dst, const char __user src, long count)
87	{
88	long res;
89	__do_strncpy_from_user(dst, src, count, res);
90	return res;
91	}
92	EXPORT_SYMBOL(__strncpy_from_user);
93
94	/**
95	* strncpy_from_user: - Copy a NUL terminated string from userspace.
96	* @dst: Destination address, in kernel space. This buffer must be at
97	* least @count bytes long.
98	* @src: Source address, in user space.
99	* @count: Maximum number of bytes to copy, including the trailing NUL.
100	*
101	* Copies a NUL-terminated string from userspace to kernel space.
102	*
103	* On success, returns the length of the string (not including the trailing
104	* NUL).
105	*
106	* If access to userspace fails, returns -EFAULT (some data may have been
107	* copied).
108	*
109	* If @count is smaller than the length of the string, copies @count bytes
110	* and returns @count.
111	*/
112	long
113	strncpy_from_user(char dst, const char __user src, long count)
114	{
115	long res = -EFAULT;
116	if (access_ok(VERIFY_READ, src, 1))
117	__do_strncpy_from_user(dst, src, count, res);
118	return res;
119	}
120	EXPORT_SYMBOL(strncpy_from_user);
121
122	/*
123	* Zero Userspace	36	* Zero Userspace
124	*/	37	*/
125		38