From: Greg Kroah-Hartman Date: Mon, 27 Nov 2017 16:08:04 +0000 (+0100) Subject: drop alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch X-Git-Tag: v3.18.85~27 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e9e98f1be4fb24835a151b46fb482b3ed7a6b4dd;p=thirdparty%2Fkernel%2Fstable-queue.git drop alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch --- diff --git a/queue-3.18/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch b/queue-3.18/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch deleted file mode 100644 index 9e7349792c9..00000000000 --- a/queue-3.18/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8428a8ebde2db1e988e41a58497a28beb7ce1705 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 21 Nov 2017 17:07:43 +0100 -Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU - -From: Takashi Iwai - -commit 8428a8ebde2db1e988e41a58497a28beb7ce1705 upstream. - -parse_audio_feature_unit() contains a code dividing potentially with -zero when a malformed FU descriptor is passed. Although there is -already a sanity check, it checks only the value zero, hence it can -still lead to a zero-division when a value 1 is passed there. - -Fix it by correcting the sanity check (and the error message -thereof). - -Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/usb/mixer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sound/usb/mixer.c -+++ b/sound/usb/mixer.c -@@ -1380,9 +1380,9 @@ static int parse_audio_feature_unit(stru - return -EINVAL; - } - csize = hdr->bControlSize; -- if (!csize) { -+ if (csize <= 1) { - usb_audio_dbg(state->chip, -- "unit %u: invalid bControlSize == 0\n", -+ "unit %u: invalid bControlSize <= 1\n", - unitid); - return -EINVAL; - } diff --git a/queue-3.18/series b/queue-3.18/series index 525a0d1ea2a..8583cfbf3c2 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -21,7 +21,6 @@ nfsd-deal-with-revoked-delegations-appropriately.patch ext4-fix-interaction-between-i_size-fallocate-and-delalloc-after-a-crash.patch alsa-usb-audio-add-sanity-checks-to-fe-parser.patch alsa-usb-audio-fix-potential-out-of-bound-access-at-parsing-su.patch -alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch alsa-usb-audio-add-sanity-checks-in-v2-clock-parsers.patch alsa-timer-remove-kernel-warning-at-compat-ioctl-error-paths.patch fs-9p-compare-qid.path-in-v9fs_test_inode.patch diff --git a/queue-4.14/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch b/queue-4.14/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch deleted file mode 100644 index 94b23ca3d5e..00000000000 --- a/queue-4.14/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8428a8ebde2db1e988e41a58497a28beb7ce1705 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 21 Nov 2017 17:07:43 +0100 -Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU - -From: Takashi Iwai - -commit 8428a8ebde2db1e988e41a58497a28beb7ce1705 upstream. - -parse_audio_feature_unit() contains a code dividing potentially with -zero when a malformed FU descriptor is passed. Although there is -already a sanity check, it checks only the value zero, hence it can -still lead to a zero-division when a value 1 is passed there. - -Fix it by correcting the sanity check (and the error message -thereof). - -Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/usb/mixer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sound/usb/mixer.c -+++ b/sound/usb/mixer.c -@@ -1476,9 +1476,9 @@ static int parse_audio_feature_unit(stru - return -EINVAL; - } - csize = hdr->bControlSize; -- if (!csize) { -+ if (csize <= 1) { - usb_audio_dbg(state->chip, -- "unit %u: invalid bControlSize == 0\n", -+ "unit %u: invalid bControlSize <= 1\n", - unitid); - return -EINVAL; - } diff --git a/queue-4.14/series b/queue-4.14/series index 9fb800ab3d0..a6faea81284 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -88,7 +88,6 @@ ext4-prevent-data-corruption-with-journaling-dax.patch alsa-pcm-update-tstamp-only-if-audio_tstamp-changed.patch alsa-usb-audio-add-sanity-checks-to-fe-parser.patch alsa-usb-audio-fix-potential-out-of-bound-access-at-parsing-su.patch -alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch alsa-usb-audio-add-sanity-checks-in-v2-clock-parsers.patch alsa-timer-remove-kernel-warning-at-compat-ioctl-error-paths.patch alsa-hda-realtek-fix-alc275-no-sound-issue.patch diff --git a/queue-4.4/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch b/queue-4.4/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch deleted file mode 100644 index 902c290b2b4..00000000000 --- a/queue-4.4/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8428a8ebde2db1e988e41a58497a28beb7ce1705 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 21 Nov 2017 17:07:43 +0100 -Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU - -From: Takashi Iwai - -commit 8428a8ebde2db1e988e41a58497a28beb7ce1705 upstream. - -parse_audio_feature_unit() contains a code dividing potentially with -zero when a malformed FU descriptor is passed. Although there is -already a sanity check, it checks only the value zero, hence it can -still lead to a zero-division when a value 1 is passed there. - -Fix it by correcting the sanity check (and the error message -thereof). - -Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/usb/mixer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sound/usb/mixer.c -+++ b/sound/usb/mixer.c -@@ -1404,9 +1404,9 @@ static int parse_audio_feature_unit(stru - return -EINVAL; - } - csize = hdr->bControlSize; -- if (!csize) { -+ if (csize <= 1) { - usb_audio_dbg(state->chip, -- "unit %u: invalid bControlSize == 0\n", -+ "unit %u: invalid bControlSize <= 1\n", - unitid); - return -EINVAL; - } diff --git a/queue-4.4/series b/queue-4.4/series index 176183466c6..7aee088bf90 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -33,7 +33,6 @@ ext4-fix-interaction-between-i_size-fallocate-and-delalloc-after-a-crash.patch alsa-pcm-update-tstamp-only-if-audio_tstamp-changed.patch alsa-usb-audio-add-sanity-checks-to-fe-parser.patch alsa-usb-audio-fix-potential-out-of-bound-access-at-parsing-su.patch -alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch alsa-usb-audio-add-sanity-checks-in-v2-clock-parsers.patch alsa-timer-remove-kernel-warning-at-compat-ioctl-error-paths.patch alsa-hda-realtek-fix-alc700-family-no-sound-issue.patch diff --git a/queue-4.9/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch b/queue-4.9/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch deleted file mode 100644 index d89dc8a215a..00000000000 --- a/queue-4.9/alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8428a8ebde2db1e988e41a58497a28beb7ce1705 Mon Sep 17 00:00:00 2001 -From: Takashi Iwai -Date: Tue, 21 Nov 2017 17:07:43 +0100 -Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU - -From: Takashi Iwai - -commit 8428a8ebde2db1e988e41a58497a28beb7ce1705 upstream. - -parse_audio_feature_unit() contains a code dividing potentially with -zero when a malformed FU descriptor is passed. Although there is -already a sanity check, it checks only the value zero, hence it can -still lead to a zero-division when a value 1 is passed there. - -Fix it by correcting the sanity check (and the error message -thereof). - -Fixes: 23caaf19b11e ("ALSA: usb-mixer: Add support for Audio Class v2.0") -Signed-off-by: Takashi Iwai -Signed-off-by: Greg Kroah-Hartman - ---- - sound/usb/mixer.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/sound/usb/mixer.c -+++ b/sound/usb/mixer.c -@@ -1470,9 +1470,9 @@ static int parse_audio_feature_unit(stru - return -EINVAL; - } - csize = hdr->bControlSize; -- if (!csize) { -+ if (csize <= 1) { - usb_audio_dbg(state->chip, -- "unit %u: invalid bControlSize == 0\n", -+ "unit %u: invalid bControlSize <= 1\n", - unitid); - return -EINVAL; - } diff --git a/queue-4.9/series b/queue-4.9/series index d8b32f0fe25..41ee856aed5 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -44,7 +44,6 @@ ext4-fix-interaction-between-i_size-fallocate-and-delalloc-after-a-crash.patch alsa-pcm-update-tstamp-only-if-audio_tstamp-changed.patch alsa-usb-audio-add-sanity-checks-to-fe-parser.patch alsa-usb-audio-fix-potential-out-of-bound-access-at-parsing-su.patch -alsa-usb-audio-fix-potential-zero-division-at-parsing-fu.patch alsa-usb-audio-add-sanity-checks-in-v2-clock-parsers.patch alsa-timer-remove-kernel-warning-at-compat-ioctl-error-paths.patch alsa-hda-fix-too-short-hdmi-dp-chmap-reporting.patch