string.h: un-fortify memcpy_and_pad

The way I'd implemented the new helper memcpy_and_pad  with
__FORTIFY_INLINE caused compiler warnings for certain kernel
configurations.

This helper is only used in a single place at this time, and thus
doesn't benefit much from fortification. So simplify the code
by dropping fortification support for now.

Fixes: 01f33c336e2d "string.h: add memcpy_and_pad()"
Signed-off-by: Martin Wilck <mwilck@suse.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>

diff --git a/include/linux/string.h b/include/linux/string.h
index e1eeb0a8a9693083e31bb5e45720764b46578158..54d21783e18dd12dd7e2ad563c2debc9e046143d 100644 (file)
--- a/include/linux/string.h
+++ b/include/linux/string.h
@@ -434,20 +434,9 @@ __FORTIFY_INLINE char *strcpy(char *p, const char *q)
  * @count: The number of bytes to copy
  * @pad: Character to use for padding if space is left in destination.
  */
-__FORTIFY_INLINE void memcpy_and_pad(void *dest, size_t dest_len,
-                                    const void *src, size_t count, int pad)
+static inline void memcpy_and_pad(void *dest, size_t dest_len,
+                                 const void *src, size_t count, int pad)
 {
-       size_t dest_size = __builtin_object_size(dest, 0);
-       size_t src_size = __builtin_object_size(src, 0);
-
-       if (__builtin_constant_p(dest_len) && __builtin_constant_p(count)) {
-               if (dest_size < dest_len && dest_size < count)
-                       __write_overflow();
-               else if (src_size < dest_len && src_size < count)
-                       __read_overflow3();
-       }
-       if (dest_size < dest_len)
-               fortify_panic(__func__);
        if (dest_len > count) {
                memcpy(dest, src, count);
                memset(dest + count, pad,  dest_len - count);