diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-03 07:53:39 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-03 07:53:39 +0100 |
commit | 44c94100b6fa83488337fe639eb7baba7dd93a91 (patch) | |
tree | ffc60bdfe3a3f2f20359d2a7df8389f3ecf51d82 /lib/test_hexdump.c | |
parent | 77df6d8d7298fd3fae12a646fd368fdcdb86152c (diff) | |
parent | 2595646791c319cadfdbf271563aac97d0843dc7 (diff) | |
download | kernel_replicant_linux-44c94100b6fa83488337fe639eb7baba7dd93a91.tar.gz kernel_replicant_linux-44c94100b6fa83488337fe639eb7baba7dd93a91.tar.bz2 kernel_replicant_linux-44c94100b6fa83488337fe639eb7baba7dd93a91.zip |
Merge 4.20-rc5 into usb-next
We need the USB fixes into usb-next.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'lib/test_hexdump.c')
-rw-r--r-- | lib/test_hexdump.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/test_hexdump.c b/lib/test_hexdump.c index 626f580b4ff7..5144899d3c6b 100644 --- a/lib/test_hexdump.c +++ b/lib/test_hexdump.c @@ -99,7 +99,7 @@ static void __init test_hexdump_prepare_test(size_t len, int rowsize, const char *q = *result++; size_t amount = strlen(q); - strncpy(p, q, amount); + memcpy(p, q, amount); p += amount; *p++ = ' '; |