From 89108419c75de57f7e67f2f0ce0be7c7bc13e4ab Mon Sep 17 00:00:00 2001 From: Oliver Neukum Date: May 09 2023 11:02:42 +0000 Subject: adm8211: fix error return code in adm8211_probe() (git-fixes). --- diff --git a/patches.suse/adm8211-fix-error-return-code-in-adm8211_probe.patch b/patches.suse/adm8211-fix-error-return-code-in-adm8211_probe.patch new file mode 100644 index 0000000..9a7115f --- /dev/null +++ b/patches.suse/adm8211-fix-error-return-code-in-adm8211_probe.patch @@ -0,0 +1,48 @@ +From 05c2a61d69ea306e891884a86486e1ef37c4b78d Mon Sep 17 00:00:00 2001 +From: Zhang Changzhong +Date: Fri, 4 Dec 2020 16:47:17 +0800 +Subject: [PATCH] adm8211: fix error return code in adm8211_probe() +Git-commit: 05c2a61d69ea306e891884a86486e1ef37c4b78d +References: git-fixes +Patch-mainline: v5.11-rc1 + +Fix to return a negative error code from the error handling +case instead of 0, as done elsewhere in this function. + +Fixes: cc0b88cf5ecf ("[PATCH] Add adm8211 802.11b wireless driver") +Reported-by: Hulk Robot +Signed-off-by: Zhang Changzhong +Signed-off-by: Kalle Valo +Link: https://lore.kernel.org/r/1607071638-33619-1-git-send-email-zhangchangzhong@huawei.com +Signed-off-by: Oliver Neukum +--- + drivers/net/wireless/admtek/adm8211.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/net/wireless/admtek/adm8211.c ++++ b/drivers/net/wireless/admtek/adm8211.c +@@ -1805,6 +1805,7 @@ static int adm8211_probe(struct pci_dev + if (io_len < 256 || mem_len < 1024) { + printk(KERN_ERR "%s (adm8211): Too short PCI resources\n", + pci_name(pdev)); ++ err = -ENOMEM; + goto err_disable_pdev; + } + +@@ -1814,6 +1815,7 @@ static int adm8211_probe(struct pci_dev + if (reg != ADM8211_SIG1 && reg != ADM8211_SIG2) { + printk(KERN_ERR "%s (adm8211): Invalid signature (0x%x)\n", + pci_name(pdev), reg); ++ err = -EINVAL; + goto err_disable_pdev; + } + +@@ -1821,7 +1823,7 @@ static int adm8211_probe(struct pci_dev + if (err) { + printk(KERN_ERR "%s (adm8211): Cannot obtain PCI resources\n", + pci_name(pdev)); +- return err; /* someone else grabbed it? don't disable it */ ++ goto err_disable_pdev; + } + + if (pci_set_dma_mask(pdev, DMA_BIT_MASK(32)) || diff --git a/series.conf b/series.conf index 88b369c..8ead06b 100644 --- a/series.conf +++ b/series.conf @@ -59133,6 +59133,7 @@ patches.suse/net-ena-use-xdp_return_frame-to-free-xdp-frames.patch patches.suse/net-ena-introduce-ndo_xdp_xmit-function-for-XDP_REDI.patch patches.suse/mac80211-don-t-set-set-TDLS-STA-bandwidth-wider-than.patch + patches.suse/adm8211-fix-error-return-code-in-adm8211_probe.patch patches.suse/mwifiex-Fix-possible-buffer-overflows-in-mwifiex_2.patch patches.suse/nfc-s3fwrn5-Release-the-nfc-firmware.patch patches.suse/ALSA-hda-Fix-regressions-on-clear-and-reconfig-sysfs.patch