Home Home > GIT Browse > SLE12-SP5-AZURE
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Thumshirn <jthumshirn@suse.de>2019-08-20 13:05:55 +0200
committerJohannes Thumshirn <jthumshirn@suse.de>2019-08-20 13:05:55 +0200
commit81777d6aa92760ae90507a076b4035fc0d4862a8 (patch)
treebc3fc6fd9f77e8cb4072cdac8c99ed68a8962bfa
parentaada20db4016ca530df8fdc7897f798496b675af (diff)
parent23b6f7f295df67efa3e661489c4c4df1bf693ce8 (diff)
Merge remote-tracking branch 'origin/SLE15-SP1' into SLE12-SP5
Conflicts: kabi/severities patches.drivers/ALSA-usb-audio-Fix-a-stack-buffer-overflow-bug-in-ch.patch patches.drivers/ALSA-usb-audio-Fix-an-OOB-bug-in-parse_audio_mixer_u.patch patches.fixes/mac80211-don-t-WARN-on-short-WMM-parameters-from-AP.patch
-rw-r--r--patches.drivers/ALSA-usb-audio-Fix-a-stack-buffer-overflow-bug-in-ch.patch26
-rw-r--r--patches.drivers/ALSA-usb-audio-Fix-an-OOB-bug-in-parse_audio_mixer_u.patch24
-rw-r--r--patches.fixes/mac80211-don-t-WARN-on-short-WMM-parameters-from-AP.patch2
3 files changed, 31 insertions, 21 deletions
diff --git a/patches.drivers/ALSA-usb-audio-Fix-a-stack-buffer-overflow-bug-in-ch.patch b/patches.drivers/ALSA-usb-audio-Fix-a-stack-buffer-overflow-bug-in-ch.patch
index 4fd996d897..a4b71dc28d 100644
--- a/patches.drivers/ALSA-usb-audio-Fix-a-stack-buffer-overflow-bug-in-ch.patch
+++ b/patches.drivers/ALSA-usb-audio-Fix-a-stack-buffer-overflow-bug-in-ch.patch
@@ -25,12 +25,14 @@ Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
- sound/usb/mixer.c | 34 ++++++++++++++++++++++++++--------
- 1 file changed, 26 insertions(+), 8 deletions(-)
+ sound/usb/mixer.c | 35 +++++++++++++++++++++++++++--------
+ 1 file changed, 27 insertions(+), 8 deletions(-)
+diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
+index ea487378be17..b5927c3d5bc0 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
-@@ -83,6 +83,7 @@ struct mixer_build {
+@@ -68,6 +68,7 @@ struct mixer_build {
unsigned char *buffer;
unsigned int buflen;
DECLARE_BITMAP(unitbitmap, MAX_ID_ELEMS);
@@ -38,7 +40,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
struct usb_audio_term oterm;
const struct usbmix_name_map *map;
const struct usbmix_selector_map *selector_map;
-@@ -782,16 +783,25 @@ static int uac_mixer_unit_get_channels(s
+@@ -775,16 +776,25 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state,
* parse the source unit recursively until it reaches to a terminal
* or a branched unit.
*/
@@ -67,7 +69,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
term->id = id;
if (protocol == UAC_VERSION_1 || protocol == UAC_VERSION_2) {
-@@ -809,7 +819,7 @@ static int check_input_term(struct mixer
+@@ -802,7 +812,7 @@ static int check_input_term(struct mixer_build *state, int id,
/* call recursively to verify that the
* referenced clock entity is valid */
@@ -76,7 +78,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
if (err < 0)
return err;
-@@ -843,7 +853,7 @@ static int check_input_term(struct mixer
+@@ -836,7 +846,7 @@ static int check_input_term(struct mixer_build *state, int id,
case UAC2_CLOCK_SELECTOR: {
struct uac_selector_unit_descriptor *d = p1;
/* call recursively to retrieve the channel info */
@@ -85,7 +87,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
if (err < 0)
return err;
term->type = UAC3_SELECTOR_UNIT << 16; /* virtual type */
-@@ -906,7 +916,7 @@ static int check_input_term(struct mixer
+@@ -899,7 +909,7 @@ static int check_input_term(struct mixer_build *state, int id,
/* call recursively to verify that the
* referenced clock entity is valid */
@@ -94,7 +96,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
if (err < 0)
return err;
-@@ -957,7 +967,7 @@ static int check_input_term(struct mixer
+@@ -950,7 +960,7 @@ static int check_input_term(struct mixer_build *state, int id,
case UAC3_CLOCK_SELECTOR: {
struct uac_selector_unit_descriptor *d = p1;
/* call recursively to retrieve the channel info */
@@ -103,7 +105,7 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
if (err < 0)
return err;
term->type = UAC3_SELECTOR_UNIT << 16; /* virtual type */
-@@ -973,7 +983,7 @@ static int check_input_term(struct mixer
+@@ -966,7 +976,7 @@ static int check_input_term(struct mixer_build *state, int id,
return -EINVAL;
/* call recursively to retrieve the channel info */
@@ -112,10 +114,11 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
if (err < 0)
return err;
-@@ -991,6 +1001,14 @@ static int check_input_term(struct mixer
+@@ -984,6 +994,15 @@ static int check_input_term(struct mixer_build *state, int id,
return -ENODEV;
}
++
+static int check_input_term(struct mixer_build *state, int id,
+ struct usb_audio_term *term)
+{
@@ -127,3 +130,6 @@ Signed-off-by: Takashi Iwai <tiwai@suse.de>
/*
* Feature Unit
*/
+--
+2.16.4
+
diff --git a/patches.drivers/ALSA-usb-audio-Fix-an-OOB-bug-in-parse_audio_mixer_u.patch b/patches.drivers/ALSA-usb-audio-Fix-an-OOB-bug-in-parse_audio_mixer_u.patch
index 369d4a5ff5..3b0f7a5716 100644
--- a/patches.drivers/ALSA-usb-audio-Fix-an-OOB-bug-in-parse_audio_mixer_u.patch
+++ b/patches.drivers/ALSA-usb-audio-Fix-an-OOB-bug-in-parse_audio_mixer_u.patch
@@ -35,18 +35,22 @@ Signed-off-by: Hui Peng <benquike@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
- sound/usb/mixer.c | 3 +++
- 1 file changed, 3 insertions(+)
+ sound/usb/mixer.c | 2 ++
+ 1 file changed, 2 insertions(+)
+diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
+index 7498b5191b68..ea487378be17 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
-@@ -2116,6 +2116,9 @@ static int parse_audio_mixer_unit(struct
- num_outs = err;
- input_pins = desc->bNrInPins;
-
+@@ -744,6 +744,8 @@ static int uac_mixer_unit_get_channels(struct mixer_build *state,
+ return -EINVAL;
+ if (!desc->bNrInPins)
+ return -EINVAL;
+ if (desc->bLength < sizeof(*desc) + desc->bNrInPins)
+ return -EINVAL;
-+
- num_ins = 0;
- ich = 0;
- for (pin = 0; pin < input_pins; pin++) {
+
+ switch (state->mixer->protocol) {
+ case UAC_VERSION_1:
+--
+2.16.4
+
diff --git a/patches.fixes/mac80211-don-t-WARN-on-short-WMM-parameters-from-AP.patch b/patches.fixes/mac80211-don-t-WARN-on-short-WMM-parameters-from-AP.patch
index c50987bffe..1e71189e1d 100644
--- a/patches.fixes/mac80211-don-t-WARN-on-short-WMM-parameters-from-AP.patch
+++ b/patches.fixes/mac80211-don-t-WARN-on-short-WMM-parameters-from-AP.patch
@@ -33,7 +33,7 @@ Acked-by: Takashi Iwai <tiwai@suse.de>
--- a/net/mac80211/mlme.c
+++ b/net/mac80211/mlme.c
-@@ -1967,6 +1967,16 @@ ieee80211_sta_wmm_params(struct ieee8021
+@@ -1872,6 +1872,16 @@ static bool ieee80211_sta_wmm_params(str
ieee80211_regulatory_limit_wmm_params(sdata, &params[ac], ac);
}