mirror of
https://github.com/torvalds/linux.git
synced 2024-11-24 05:02:12 +00:00
f6a3308d6f
This reverts commit 83af58f806
.
It turns out that at least the assembly implementation for strncpy() was
buggy. Revert the whole commit and return back to the default coding.
Signed-off-by: Helge Deller <deller@gmx.de>
Cc: <stable@vger.kernel.org> # v5.4+
Cc: Rasmus Villemoes <linux@rasmusvillemoes.dk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
73 lines
1.5 KiB
C
73 lines
1.5 KiB
C
/* SPDX-License-Identifier: GPL-2.0-or-later */
|
|
#include <linux/types.h>
|
|
#include <asm/string.h>
|
|
|
|
#define OPSIZ (BITS_PER_LONG/8)
|
|
typedef unsigned long op_t;
|
|
|
|
void *
|
|
memset (void *dstpp, int sc, size_t len)
|
|
{
|
|
unsigned int c = sc;
|
|
long int dstp = (long int) dstpp;
|
|
|
|
if (len >= 8)
|
|
{
|
|
size_t xlen;
|
|
op_t cccc;
|
|
|
|
cccc = (unsigned char) c;
|
|
cccc |= cccc << 8;
|
|
cccc |= cccc << 16;
|
|
if (OPSIZ > 4)
|
|
/* Do the shift in two steps to avoid warning if long has 32 bits. */
|
|
cccc |= (cccc << 16) << 16;
|
|
|
|
/* There are at least some bytes to set.
|
|
No need to test for LEN == 0 in this alignment loop. */
|
|
while (dstp % OPSIZ != 0)
|
|
{
|
|
((unsigned char *) dstp)[0] = c;
|
|
dstp += 1;
|
|
len -= 1;
|
|
}
|
|
|
|
/* Write 8 `op_t' per iteration until less than 8 `op_t' remain. */
|
|
xlen = len / (OPSIZ * 8);
|
|
while (xlen > 0)
|
|
{
|
|
((op_t *) dstp)[0] = cccc;
|
|
((op_t *) dstp)[1] = cccc;
|
|
((op_t *) dstp)[2] = cccc;
|
|
((op_t *) dstp)[3] = cccc;
|
|
((op_t *) dstp)[4] = cccc;
|
|
((op_t *) dstp)[5] = cccc;
|
|
((op_t *) dstp)[6] = cccc;
|
|
((op_t *) dstp)[7] = cccc;
|
|
dstp += 8 * OPSIZ;
|
|
xlen -= 1;
|
|
}
|
|
len %= OPSIZ * 8;
|
|
|
|
/* Write 1 `op_t' per iteration until less than OPSIZ bytes remain. */
|
|
xlen = len / OPSIZ;
|
|
while (xlen > 0)
|
|
{
|
|
((op_t *) dstp)[0] = cccc;
|
|
dstp += OPSIZ;
|
|
xlen -= 1;
|
|
}
|
|
len %= OPSIZ;
|
|
}
|
|
|
|
/* Write the last few bytes. */
|
|
while (len > 0)
|
|
{
|
|
((unsigned char *) dstp)[0] = c;
|
|
dstp += 1;
|
|
len -= 1;
|
|
}
|
|
|
|
return dstpp;
|
|
}
|