4.14-stable patches

added patches:
	alsa-pcm-disallow-linking-stream-to-itself.patch
	crypto-cavium-nitrox-fix-nitrox_get_first_device-when-ndevlist-is-fully-iterated.patch

diff --git a/queue-4.14/alsa-pcm-disallow-linking-stream-to-itself.patch b/queue-4.14/alsa-pcm-disallow-linking-stream-to-itself.patch
new file mode 100644 (file)
index 0000000..9d0dee5
--- /dev/null
+++ b/queue-4.14/alsa-pcm-disallow-linking-stream-to-itself.patch
@@ -0,0 +1,42 @@
+From 951e2736f4b11b58dc44d41964fa17c3527d882a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20Miros=C5=82aw?= <mirq-linux@rere.qmqm.pl>
+Date: Mon, 8 Jun 2020 18:50:39 +0200
+Subject: ALSA: pcm: disallow linking stream to itself
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+From: Michał Mirosław <mirq-linux@rere.qmqm.pl>
+
+commit 951e2736f4b11b58dc44d41964fa17c3527d882a upstream.
+
+Prevent SNDRV_PCM_IOCTL_LINK linking stream to itself - the code
+can't handle it. Fixed commit is not where bug was introduced, but
+changes the context significantly.
+
+Cc: stable@vger.kernel.org
+Fixes: 0888c321de70 ("pcm_native: switch to fdget()/fdput()")
+Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
+Link: https://lore.kernel.org/r/89c4a2487609a0ed6af3ecf01cc972bdc59a7a2d.1591634956.git.mirq-linux@rere.qmqm.pl
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+
+---
+ sound/core/pcm_native.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/sound/core/pcm_native.c
++++ b/sound/core/pcm_native.c
+@@ -1950,6 +1950,11 @@ static int snd_pcm_link(struct snd_pcm_s
+       }
+       pcm_file = f.file->private_data;
+       substream1 = pcm_file->substream;
++      if (substream == substream1) {
++              res = -EINVAL;
++              goto _badf;
++      }
++
+       group = kmalloc(sizeof(*group), GFP_KERNEL);
+       if (!group) {
+               res = -ENOMEM;

diff --git a/queue-4.14/crypto-cavium-nitrox-fix-nitrox_get_first_device-when-ndevlist-is-fully-iterated.patch b/queue-4.14/crypto-cavium-nitrox-fix-nitrox_get_first_device-when-ndevlist-is-fully-iterated.patch
new file mode 100644 (file)
index 0000000..069f874
--- /dev/null
+++ b/queue-4.14/crypto-cavium-nitrox-fix-nitrox_get_first_device-when-ndevlist-is-fully-iterated.patch
@@ -0,0 +1,45 @@
+From 320bdbd816156f9ca07e5fed7bfb449f2908dda7 Mon Sep 17 00:00:00 2001
+From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+Date: Sat, 30 May 2020 15:35:37 +0200
+Subject: crypto: cavium/nitrox - Fix 'nitrox_get_first_device()' when ndevlist is fully iterated
+
+From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+
+commit 320bdbd816156f9ca07e5fed7bfb449f2908dda7 upstream.
+
+When a list is completely iterated with 'list_for_each_entry(x, ...)', x is
+not NULL at the end.
+
+While at it, remove a useless initialization of the ndev variable. It
+is overridden by 'list_for_each_entry'.
+
+Fixes: f2663872f073 ("crypto: cavium - Register the CNN55XX supported crypto algorithms.")
+Cc: <stable@vger.kernel.org>
+Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/crypto/cavium/nitrox/nitrox_main.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/drivers/crypto/cavium/nitrox/nitrox_main.c
++++ b/drivers/crypto/cavium/nitrox/nitrox_main.c
+@@ -183,7 +183,7 @@ static void nitrox_remove_from_devlist(s
+ 
+ struct nitrox_device *nitrox_get_first_device(void)
+ {
+-      struct nitrox_device *ndev = NULL;
++      struct nitrox_device *ndev;
+ 
+       mutex_lock(&devlist_lock);
+       list_for_each_entry(ndev, &ndevlist, list) {
+@@ -191,7 +191,7 @@ struct nitrox_device *nitrox_get_first_d
+                       break;
+       }
+       mutex_unlock(&devlist_lock);
+-      if (!ndev)
++      if (&ndev->list == &ndevlist)
+               return NULL;
+ 
+       refcount_inc(&ndev->refcnt);

diff --git a/queue-4.14/series b/queue-4.14/series
index b1f434b86dcfa2361428cf153a84b1e8d4c7f17b..a4d4a411744b9373dd8329ac9a2c12ef1304b5a9 100644 (file)
--- a/queue-4.14/series
+++ b/queue-4.14/series
@@ -31,3 +31,5 @@ cgroup-blkcg-prepare-some-symbols-for-module-and-config_cgroup-usages.patch
 nilfs2-fix-null-pointer-dereference-at-nilfs_segctor_do_construct.patch
 spi-bcm2835aux-fix-controller-unregister-order.patch
 spi-bcm-qspi-when-tx-rx-buffer-is-null-set-to-0.patch
+crypto-cavium-nitrox-fix-nitrox_get_first_device-when-ndevlist-is-fully-iterated.patch
+alsa-pcm-disallow-linking-stream-to-itself.patch