This is a note to let you know that I've just added the patch titled
adm80211: return an error if adm8211_alloc_rings() fails
to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
adm80211-return-an-error-if-adm8211_alloc_rings-fails.patch
and it can be found in the queue-4.9 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From foo@baz Tue Nov 28 10:49:28 CET 2017
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Date: Wed, 7 Dec 2016 14:21:22 +0300
Subject: adm80211: return an error if adm8211_alloc_rings() fails
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
[ Upstream commit c705a6b3aa7804d7bc6660183f51e510c61dc807 ]
We accidentally return success when adm8211_alloc_rings() fails but we
should preserve the error code.
Fixes: cc0b88cf5ecf ("[PATCH] Add adm8211 802.11b wireless driver")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Kalle Valo <kvalo@xxxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/net/wireless/admtek/adm8211.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/net/wireless/admtek/adm8211.c
+++ b/drivers/net/wireless/admtek/adm8211.c
@@ -1843,7 +1843,8 @@ static int adm8211_probe(struct pci_dev
priv->rx_ring_size = rx_ring_size;
priv->tx_ring_size = tx_ring_size;
- if (adm8211_alloc_rings(dev)) {
+ err = adm8211_alloc_rings(dev);
+ if (err) {
printk(KERN_ERR "%s (adm8211): Cannot allocate TX/RX ring\n",
pci_name(pdev));
goto err_iounmap;
Patches currently in stable-queue which might be from dan.carpenter@xxxxxxxxxx are
queue-4.9/ecryptfs-use-after-free-in-ecryptfs_release_messaging.patch
queue-4.9/adm80211-return-an-error-if-adm8211_alloc_rings-fails.patch
queue-4.9/nfc-fix-device-allocation-error-return.patch