Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1359798f authored by Martin Wilck's avatar Martin Wilck Committed by Christoph Hellwig
Browse files

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: 01f33c33 "string.h: add memcpy_and_pad()"
Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 044a9df1

include/linux/string.h

+2 −13
Original line number Diff line number Diff line
@@ -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,

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);