commit:     7340d2fab2df41bb74b98a08f238a2e207383fdd
Author:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 18 19:49:31 2021 +0000
Commit:     Mike Pagano <mpagano <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 19:49:31 2021 +0000
URL:        https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=7340d2fa

Remove redundant patch

2700_ALSA-PCM-Fix-NULL-deref-at-mmap-checks.patch

Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org>

 0000_README                                       |  4 ---
 2700_ALSA-PCM-Fix-NULL-deref-at-mmap-checks.patch | 40 -----------------------
 2 files changed, 44 deletions(-)

diff --git a/0000_README b/0000_README
index c40e5bc6..3970c8b7 100644
--- a/0000_README
+++ b/0000_README
@@ -67,10 +67,6 @@ Patch:  
2000_BT-Check-key-sizes-only-if-Secure-Simple-Pairing-enabled.patch
 From:   
https://lore.kernel.org/linux-bluetooth/[email protected]/raw
 Desc:   Bluetooth: Check key sizes only when Secure Simple Pairing is enabled. 
See bug #686758
 
-Patch:  2700_ALSA-PCM-Fix-NULL-deref-at-mmap-checks.patch
-From:   https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/
-Desc:   ALSA: PCM: Fix NULL dereference at mmap checks
-
 Patch:  2900_tmp513-Fix-build-issue-by-selecting-CONFIG_REG.patch
 From:   https://bugs.gentoo.org/710790
 Desc:   tmp513 requies REGMAP_I2C to build.  Select it by default in Kconfig. 
See bug #710790. Thanks to Phil Stracchino

diff --git a/2700_ALSA-PCM-Fix-NULL-deref-at-mmap-checks.patch 
b/2700_ALSA-PCM-Fix-NULL-deref-at-mmap-checks.patch
deleted file mode 100644
index 44f335c3..00000000
--- a/2700_ALSA-PCM-Fix-NULL-deref-at-mmap-checks.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 8e537d5dec34cac746dd6abf6a83e5de3aa471fc Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <[email protected]>
-Date: Sun, 7 Nov 2021 17:39:11 +0100
-Subject: ALSA: PCM: Fix NULL dereference at mmap checks
-
-The recent refactoring of mmap handling caused Oops on some devices
-that don't use the standard memory allocations.  This patch addresses
-it by allowing snd_dma_buffer_mmap() helper to receive the NULL
-pointer dmab argument (and return an error appropriately).
-
-Fixes: a202bd1ad86d ("ALSA: core: Move mmap handler into memalloc ops")
-Cc: <[email protected]>
-Link: https://lore.kernel.org/r/[email protected]
-Signed-off-by: Takashi Iwai <[email protected]>
----
- sound/core/memalloc.c | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-(limited to 'sound/core/memalloc.c')
-
-diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
-index ea9698cea2e3b..ad4a76b47b92c 100644
---- a/sound/core/memalloc.c
-+++ b/sound/core/memalloc.c
-@@ -183,8 +183,11 @@ EXPORT_SYMBOL_GPL(snd_devm_alloc_dir_pages);
- int snd_dma_buffer_mmap(struct snd_dma_buffer *dmab,
-                       struct vm_area_struct *area)
- {
--      const struct snd_malloc_ops *ops = snd_dma_get_ops(dmab);
-+      const struct snd_malloc_ops *ops;
- 
-+      if (!dmab)
-+              return -ENOENT;
-+      ops = snd_dma_get_ops(dmab);
-       if (ops && ops->mmap)
-               return ops->mmap(dmab, area);
-       else
--- 
-cgit 1.2.3-1.el7
-

Reply via email to