diff options
| author | Martin Wilck <mwilck@suse.com> | 2017-09-06 14:36:57 +0200 |
|---|---|---|
| committer | Alexander Grund <flamefire89@gmail.com> | 2024-03-07 18:16:51 +0100 |
| commit | 603fe30acf57a20d48ceec9fccb78715f5d589c9 (patch) | |
| tree | 5775be663331065ff6ea42b03f72a894631ad840 | |
| parent | 02205a347c40cfbcc5ce34e4ecd63ea821221237 (diff) | |
string.h: un-fortify memcpy_and_pad
commit 1359798f9d4082eb04575efdd19512fbd9c28464 upstream.
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()"
Change-Id: I8bb1ec4490e27d450ba2042074d6f228b102462a
Signed-off-by: Martin Wilck <mwilck@suse.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Alexander Grund <theflamefire89@gmail.com>
| -rw-r--r-- | include/linux/string.h | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/include/linux/string.h b/include/linux/string.h index 84af888924e1..c874f5ea9bb3 100644 --- a/include/linux/string.h +++ b/include/linux/string.h @@ -212,20 +212,9 @@ static inline const char *kbasename(const char *path) * @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); |