From: Greg Kroah-Hartman Date: Thu, 6 Dec 2018 05:58:57 +0000 (+0100) Subject: 4.14-stable patches X-Git-Tag: v4.19.8~33 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=baa004f685c57ffd102537e771a66b69040bbade;p=thirdparty%2Fkernel%2Fstable-queue.git 4.14-stable patches added patches: alsa-intel_hdmi-use-strlcpy-instead-of-strncpy.patch kobject-replace-strncpy-with-memcpy.patch test_hexdump-use-memcpy-instead-of-strncpy.patch --- diff --git a/queue-4.14/alsa-intel_hdmi-use-strlcpy-instead-of-strncpy.patch b/queue-4.14/alsa-intel_hdmi-use-strlcpy-instead-of-strncpy.patch new file mode 100644 index 00000000000..d2efc317eff --- /dev/null +++ b/queue-4.14/alsa-intel_hdmi-use-strlcpy-instead-of-strncpy.patch @@ -0,0 +1,33 @@ +From c288248f5b26cd5563112fcdc077bf44964a942d Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 27 Jun 2018 14:59:00 +0200 +Subject: ALSA: intel_hdmi: Use strlcpy() instead of strncpy() + +From: Takashi Iwai + +commit c288248f5b26cd5563112fcdc077bf44964a942d upstream. + +hdmi_lpe_audio_probe() copies the pcm name string via strncpy(), but +as a gcc8 warning suggests, it misses a NUL terminator, and unlikely +the expected result. + +Use the proper one, strlcpy() instead. + +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman + +--- + sound/x86/intel_hdmi_audio.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/sound/x86/intel_hdmi_audio.c ++++ b/sound/x86/intel_hdmi_audio.c +@@ -1839,7 +1839,7 @@ static int hdmi_lpe_audio_probe(struct p + /* setup private data which can be retrieved when required */ + pcm->private_data = ctx; + pcm->info_flags = 0; +- strncpy(pcm->name, card->shortname, strlen(card->shortname)); ++ strlcpy(pcm->name, card->shortname, strlen(card->shortname)); + /* setup the ops for playabck */ + snd_pcm_set_ops(pcm, SNDRV_PCM_STREAM_PLAYBACK, &had_pcm_ops); + diff --git a/queue-4.14/kobject-replace-strncpy-with-memcpy.patch b/queue-4.14/kobject-replace-strncpy-with-memcpy.patch new file mode 100644 index 00000000000..5eaa6a51edc --- /dev/null +++ b/queue-4.14/kobject-replace-strncpy-with-memcpy.patch @@ -0,0 +1,40 @@ +From 77d2a24b6107bd9b3bf2403a65c1428a9da83dd0 Mon Sep 17 00:00:00 2001 +From: Guenter Roeck +Date: Sun, 1 Jul 2018 13:57:16 -0700 +Subject: kobject: Replace strncpy with memcpy + +From: Guenter Roeck + +commit 77d2a24b6107bd9b3bf2403a65c1428a9da83dd0 upstream. + +gcc 8.1.0 complains: + +lib/kobject.c:128:3: warning: + 'strncpy' output truncated before terminating nul copying as many + bytes from a string as its length [-Wstringop-truncation] +lib/kobject.c: In function 'kobject_get_path': +lib/kobject.c:125:13: note: length computed here + +Using strncpy() is indeed less than perfect since the length of data to +be copied has already been determined with strlen(). Replace strncpy() +with memcpy() to address the warning and optimize the code a little. + +Signed-off-by: Guenter Roeck +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Greg Kroah-Hartman + +--- + lib/kobject.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/kobject.c ++++ b/lib/kobject.c +@@ -127,7 +127,7 @@ static void fill_kobj_path(struct kobjec + int cur = strlen(kobject_name(parent)); + /* back up enough to print this name with '/' */ + length -= cur; +- strncpy(path + length, kobject_name(parent), cur); ++ memcpy(path + length, kobject_name(parent), cur); + *(path + --length) = '/'; + } + diff --git a/queue-4.14/series b/queue-4.14/series index f3152749a59..083458d386b 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -1,2 +1,5 @@ kbuild-suppress-packed-not-aligned-warning-for-default-setting-only.patch disable-stringop-truncation-warnings-for-now.patch +test_hexdump-use-memcpy-instead-of-strncpy.patch +kobject-replace-strncpy-with-memcpy.patch +alsa-intel_hdmi-use-strlcpy-instead-of-strncpy.patch diff --git a/queue-4.14/test_hexdump-use-memcpy-instead-of-strncpy.patch b/queue-4.14/test_hexdump-use-memcpy-instead-of-strncpy.patch new file mode 100644 index 00000000000..0b15408f2c9 --- /dev/null +++ b/queue-4.14/test_hexdump-use-memcpy-instead-of-strncpy.patch @@ -0,0 +1,38 @@ +From b1286ed7158e9b62787508066283ab0b8850b518 Mon Sep 17 00:00:00 2001 +From: Linus Torvalds +Date: Fri, 30 Nov 2018 12:13:15 -0800 +Subject: test_hexdump: use memcpy instead of strncpy + +From: Linus Torvalds + +commit b1286ed7158e9b62787508066283ab0b8850b518 upstream. + +New versions of gcc reasonably warn about the odd pattern of + + strncpy(p, q, strlen(q)); + +which really doesn't make sense: the strncpy() ends up being just a slow +and odd way to write memcpy() in this case. + +Apparently there was a patch for this floating around earlier, but it +got lost. + +Acked-again-by: Andy Shevchenko +Signed-off-by: Linus Torvalds +Signed-off-by: Greg Kroah-Hartman + +--- + lib/test_hexdump.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/lib/test_hexdump.c ++++ b/lib/test_hexdump.c +@@ -81,7 +81,7 @@ static void __init test_hexdump_prepare_ + const char *q = *result++; + size_t amount = strlen(q); + +- strncpy(p, q, amount); ++ memcpy(p, q, amount); + p += amount; + + *p++ = ' ';