From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 19 Mar 2018 10:33:57 +0000 (+0100)
Subject: fix up alsa patch for 3.18, 4.4, and 4.9
X-Git-Tag: v4.15.12~22
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=206084bace4f3dfed0e30578b936e31eeeef4f06;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up alsa patch for 3.18, 4.4, and 4.9
---

diff --git a/queue-3.18/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch b/queue-3.18/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
index 25007232bed..2887e6b26f9 100644
--- a/queue-3.18/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
+++ b/queue-3.18/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	if (err < 0)
 -		return err;
 +		goto error;
-+	format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);
++	format_mask = *hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
  	for (fmt = 0; fmt < 32; ++fmt) {
  		if (snd_mask_test(&format_mask, fmt)) {
  			int f = snd_pcm_oss_format_to(fmt);
diff --git a/queue-4.4/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch b/queue-4.4/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
index 854f5068315..8fef5941216 100644
--- a/queue-4.4/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
+++ b/queue-4.4/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	if (err < 0)
 -		return err;
 +		goto error;
-+	format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);
++	format_mask = *hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
  	for (fmt = 0; fmt < 32; ++fmt) {
  		if (snd_mask_test(&format_mask, fmt)) {
  			int f = snd_pcm_oss_format_to(fmt);
diff --git a/queue-4.9/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch b/queue-4.9/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
index 854f5068315..8fef5941216 100644
--- a/queue-4.9/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
+++ b/queue-4.9/alsa-pcm-fix-uaf-in-snd_pcm_oss_get_formats.patch
@@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	if (err < 0)
 -		return err;
 +		goto error;
-+	format_mask = hw_param_mask_c(params, SNDRV_PCM_HW_PARAM_FORMAT);
++	format_mask = *hw_param_mask(params, SNDRV_PCM_HW_PARAM_FORMAT);
  	for (fmt = 0; fmt < 32; ++fmt) {
  		if (snd_mask_test(&format_mask, fmt)) {
  			int f = snd_pcm_oss_format_to(fmt);