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 25007232bedf557cf1b687824dde623b0a9ccf19..2887e6b26f97c5e1abba8e31f1d29ffc89d73d14 100644 (file)
--- 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 854f50683153c59749d4d91ab17b3cd976ddbc7b..8fef5941216e73380be305a0121811a1a7c6f103 100644 (file)
--- 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 854f50683153c59749d4d91ab17b3cd976ddbc7b..8fef5941216e73380be305a0121811a1a7c6f103 100644 (file)
--- 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);