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 (file)
index 9e73497..0000000
--- 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 <tiwai@suse.de>
-Date: Tue, 21 Nov 2017 17:07:43 +0100
-Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU
-
-From: Takashi Iwai <tiwai@suse.de>
-
-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 <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 525a0d1ea2a0f09fe8a40bf4429e3fb441cf1f09..8583cfbf3c213822f697002c28eec3181a49e85f 100644 (file)
--- 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 (file)
index 94b23ca..0000000
--- 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 <tiwai@suse.de>
-Date: Tue, 21 Nov 2017 17:07:43 +0100
-Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU
-
-From: Takashi Iwai <tiwai@suse.de>
-
-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 <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 9fb800ab3d0c1ce9f6ca8d63a3233108267043c3..a6faea81284dc7352aa8cd74790f85224e182540 100644 (file)
--- 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 (file)
index 902c290..0000000
--- 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 <tiwai@suse.de>
-Date: Tue, 21 Nov 2017 17:07:43 +0100
-Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU
-
-From: Takashi Iwai <tiwai@suse.de>
-
-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 <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 176183466c6b613d8f095f2d73da0076aa4094ac..7aee088bf9090243cf459e78a1a67e67d4a0fe8b 100644 (file)
--- 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 (file)
index d89dc8a..0000000
--- 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 <tiwai@suse.de>
-Date: Tue, 21 Nov 2017 17:07:43 +0100
-Subject: ALSA: usb-audio: Fix potential zero-division at parsing FU
-
-From: Takashi Iwai <tiwai@suse.de>
-
-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 <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- 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 d8b32f0fe25159a9dc8f8789f97d9da56c9b11ac..41ee856aed5f6d78c46f4ca73f150756838e12a9 100644 (file)
--- 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