drop wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 650b6f81832867cd0956ccba6fbba7abf32de186..87d4ccac88cb2f60bf84b83a191392a20ab27c26 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -327,7 +327,6 @@ arm-decompressor-include-.data.rel.ro.local.patch
 x86-entry-work-around-clang-__bdos-bug.patch
 nfsd-return-nfserr_serverfault-if-splice_ok-but-buf-.patch
 nfsd-fix-use-after-free-on-source-server-when-doing-.patch
-wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
 wifi-brcmfmac-fix-invalid-address-access-when-enabli.patch
 bpftool-clear-errno-after-libcap-s-checks.patch
 openvswitch-fix-double-reporting-of-drops-in-dropwat.patch

diff --git a/queue-5.10/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch b/queue-5.10/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
deleted file mode 100644 (file)
index 018c1cc..0000000
--- a/queue-5.10/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From ba167126fd171934bf173a0db147ec9f6b20bfb7 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Jul 2022 14:50:03 +0800
-Subject: wifi: rtw88: phy: fix warning of possible buffer overflow
-
-From: Zong-Zhe Yang <kevin_yang@realtek.com>
-
-[ Upstream commit 86331c7e0cd819bf0c1d0dcf895e0c90b0aa9a6f ]
-
-reported by smatch
-
-phy.c:854 rtw_phy_linear_2_db() error: buffer overflow 'db_invert_table[i]'
-8 <= 8 (assuming for loop doesn't break)
-
-However, it seems to be a false alarm because we prevent it originally via
-       if (linear >= db_invert_table[11][7])
-               return 96; /* maximum 96 dB */
-
-Still, we adjust the code to be more readable and avoid smatch warning.
-
-Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
-Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://lore.kernel.org/r/20220727065003.28340-5-pkshih@realtek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/realtek/rtw88/phy.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
-index af8b703d11d4..0fc5a893c395 100644
---- a/drivers/net/wireless/realtek/rtw88/phy.c
-+++ b/drivers/net/wireless/realtek/rtw88/phy.c
-@@ -604,23 +604,18 @@ static u8 rtw_phy_linear_2_db(u64 linear)
-       u8 j;
-       u32 dB;
- 
--      if (linear >= db_invert_table[11][7])
--              return 96; /* maximum 96 dB */
--
-       for (i = 0; i < 12; i++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][7])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][7])
--                      break;
-+              for (j = 0; j < 8; j++) {
-+                      if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
-+                              goto cnt;
-+                      else if (i > 2 && linear <= db_invert_table[i][j])
-+                              goto cnt;
-+              }
-       }
- 
--      for (j = 0; j < 8; j++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][j])
--                      break;
--      }
-+      return 96; /* maximum 96 dB */
- 
-+cnt:
-       if (j == 0 && i == 0)
-               goto end;
- 
--- 
-2.35.1
-

diff --git a/queue-5.15/series b/queue-5.15/series
index 9e871e410804758337ffa7d4dc9bcb078ff971dc..b461832556b82f850c4c6147914c35960ba79b8e 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -442,7 +442,6 @@ acpi-x86-add-a-quirk-for-dell-inspiron-14-2-in-1-for.patch
 x86-entry-work-around-clang-__bdos-bug.patch
 nfsd-return-nfserr_serverfault-if-splice_ok-but-buf-.patch
 nfsd-fix-use-after-free-on-source-server-when-doing-.patch
-wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
 wifi-brcmfmac-fix-invalid-address-access-when-enabli.patch
 bpftool-clear-errno-after-libcap-s-checks.patch
 ice-set-tx_tstamps-when-creating-new-tx-rings-via-et.patch

diff --git a/queue-5.15/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch b/queue-5.15/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
deleted file mode 100644 (file)
index 004f09d..0000000
--- a/queue-5.15/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8080b5eda66983e2848d063abc706849b0e13ce6 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Jul 2022 14:50:03 +0800
-Subject: wifi: rtw88: phy: fix warning of possible buffer overflow
-
-From: Zong-Zhe Yang <kevin_yang@realtek.com>
-
-[ Upstream commit 86331c7e0cd819bf0c1d0dcf895e0c90b0aa9a6f ]
-
-reported by smatch
-
-phy.c:854 rtw_phy_linear_2_db() error: buffer overflow 'db_invert_table[i]'
-8 <= 8 (assuming for loop doesn't break)
-
-However, it seems to be a false alarm because we prevent it originally via
-       if (linear >= db_invert_table[11][7])
-               return 96; /* maximum 96 dB */
-
-Still, we adjust the code to be more readable and avoid smatch warning.
-
-Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
-Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://lore.kernel.org/r/20220727065003.28340-5-pkshih@realtek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/realtek/rtw88/phy.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
-index 569dd3cfde35..df2edb87468f 100644
---- a/drivers/net/wireless/realtek/rtw88/phy.c
-+++ b/drivers/net/wireless/realtek/rtw88/phy.c
-@@ -751,23 +751,18 @@ static u8 rtw_phy_linear_2_db(u64 linear)
-       u8 j;
-       u32 dB;
- 
--      if (linear >= db_invert_table[11][7])
--              return 96; /* maximum 96 dB */
--
-       for (i = 0; i < 12; i++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][7])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][7])
--                      break;
-+              for (j = 0; j < 8; j++) {
-+                      if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
-+                              goto cnt;
-+                      else if (i > 2 && linear <= db_invert_table[i][j])
-+                              goto cnt;
-+              }
-       }
- 
--      for (j = 0; j < 8; j++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][j])
--                      break;
--      }
-+      return 96; /* maximum 96 dB */
- 
-+cnt:
-       if (j == 0 && i == 0)
-               goto end;
- 
--- 
-2.35.1
-

diff --git a/queue-5.19/series b/queue-5.19/series
index 4d1a7cf30ff4b1c05fd4ff38f3259e9ec32c0398..7eb225b08a6ba2e30ffdfa4f6fab07e50be152ca 100644 (file)
--- a/queue-5.19/series
+++ b/queue-5.19/series
@@ -602,7 +602,6 @@ x86-entry-work-around-clang-__bdos-bug.patch
 nfsd-return-nfserr_serverfault-if-splice_ok-but-buf-.patch
 nfsd-fix-use-after-free-on-source-server-when-doing-.patch
 libbpf-do-not-require-executable-permission-for-shar.patch
-wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
 wifi-ath10k-set-tx-credit-to-one-for-wcn3990-snoc-ba.patch
 wifi-brcmfmac-fix-invalid-address-access-when-enabli.patch
 bpftool-clear-errno-after-libcap-s-checks.patch

diff --git a/queue-5.19/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch b/queue-5.19/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
deleted file mode 100644 (file)
index 5fb1b8f..0000000
--- a/queue-5.19/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 595e6963b3c99ffe2b76c2f62a1d896f3215fc46 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Jul 2022 14:50:03 +0800
-Subject: wifi: rtw88: phy: fix warning of possible buffer overflow
-
-From: Zong-Zhe Yang <kevin_yang@realtek.com>
-
-[ Upstream commit 86331c7e0cd819bf0c1d0dcf895e0c90b0aa9a6f ]
-
-reported by smatch
-
-phy.c:854 rtw_phy_linear_2_db() error: buffer overflow 'db_invert_table[i]'
-8 <= 8 (assuming for loop doesn't break)
-
-However, it seems to be a false alarm because we prevent it originally via
-       if (linear >= db_invert_table[11][7])
-               return 96; /* maximum 96 dB */
-
-Still, we adjust the code to be more readable and avoid smatch warning.
-
-Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
-Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://lore.kernel.org/r/20220727065003.28340-5-pkshih@realtek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/realtek/rtw88/phy.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
-index 8982e0c98dac..da1efec0aa85 100644
---- a/drivers/net/wireless/realtek/rtw88/phy.c
-+++ b/drivers/net/wireless/realtek/rtw88/phy.c
-@@ -816,23 +816,18 @@ static u8 rtw_phy_linear_2_db(u64 linear)
-       u8 j;
-       u32 dB;
- 
--      if (linear >= db_invert_table[11][7])
--              return 96; /* maximum 96 dB */
--
-       for (i = 0; i < 12; i++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][7])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][7])
--                      break;
-+              for (j = 0; j < 8; j++) {
-+                      if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
-+                              goto cnt;
-+                      else if (i > 2 && linear <= db_invert_table[i][j])
-+                              goto cnt;
-+              }
-       }
- 
--      for (j = 0; j < 8; j++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][j])
--                      break;
--      }
-+      return 96; /* maximum 96 dB */
- 
-+cnt:
-       if (j == 0 && i == 0)
-               goto end;
- 
--- 
-2.35.1
-

diff --git a/queue-5.4/series b/queue-5.4/series
index ff7dc6dbfbec154c37e0f5c5ddbf0cc2224468ac..11664452fb7c2060f072e9aa0d69ebce2373e75f 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -189,7 +189,6 @@ powercap-intel_rapl-fix-ubsan-shift-out-of-bounds-is.patch
 thermal-intel_powerclamp-use-get_cpu-instead-of-smp_.patch
 x86-entry-work-around-clang-__bdos-bug.patch
 nfsd-return-nfserr_serverfault-if-splice_ok-but-buf-.patch
-wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
 wifi-brcmfmac-fix-invalid-address-access-when-enabli.patch
 bpftool-clear-errno-after-libcap-s-checks.patch
 openvswitch-fix-double-reporting-of-drops-in-dropwat.patch

diff --git a/queue-5.4/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch b/queue-5.4/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
deleted file mode 100644 (file)
index 336b2f5..0000000
--- a/queue-5.4/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 8a7e863df42e7bd282bc9299f641c95110b2ff8c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Jul 2022 14:50:03 +0800
-Subject: wifi: rtw88: phy: fix warning of possible buffer overflow
-
-From: Zong-Zhe Yang <kevin_yang@realtek.com>
-
-[ Upstream commit 86331c7e0cd819bf0c1d0dcf895e0c90b0aa9a6f ]
-
-reported by smatch
-
-phy.c:854 rtw_phy_linear_2_db() error: buffer overflow 'db_invert_table[i]'
-8 <= 8 (assuming for loop doesn't break)
-
-However, it seems to be a false alarm because we prevent it originally via
-       if (linear >= db_invert_table[11][7])
-               return 96; /* maximum 96 dB */
-
-Still, we adjust the code to be more readable and avoid smatch warning.
-
-Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
-Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://lore.kernel.org/r/20220727065003.28340-5-pkshih@realtek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/realtek/rtw88/phy.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
-index 02da69e9dfe7..2227bbd14644 100644
---- a/drivers/net/wireless/realtek/rtw88/phy.c
-+++ b/drivers/net/wireless/realtek/rtw88/phy.c
-@@ -586,23 +586,18 @@ static u8 rtw_phy_linear_2_db(u64 linear)
-       u8 j;
-       u32 dB;
- 
--      if (linear >= db_invert_table[11][7])
--              return 96; /* maximum 96 dB */
--
-       for (i = 0; i < 12; i++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][7])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][7])
--                      break;
-+              for (j = 0; j < 8; j++) {
-+                      if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
-+                              goto cnt;
-+                      else if (i > 2 && linear <= db_invert_table[i][j])
-+                              goto cnt;
-+              }
-       }
- 
--      for (j = 0; j < 8; j++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][j])
--                      break;
--      }
-+      return 96; /* maximum 96 dB */
- 
-+cnt:
-       if (j == 0 && i == 0)
-               goto end;
- 
--- 
-2.35.1
-

diff --git a/queue-6.0/series b/queue-6.0/series
index b4383ea38ce88ea4c963c5795e31cb8ead061d7f..d273481ff802a1f2feecf1a0cecd5cb0d499b86b 100644 (file)
--- a/queue-6.0/series
+++ b/queue-6.0/series
@@ -668,7 +668,6 @@ nfsd-return-nfserr_serverfault-if-splice_ok-but-buf-.patch
 nfsd-fix-use-after-free-on-source-server-when-doing-.patch
 libbpf-ensure-functions-with-always_inline-attribute.patch
 libbpf-do-not-require-executable-permission-for-shar.patch
-wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
 wifi-brcmfmac-fix-invalid-address-access-when-enabli.patch
 bpftool-clear-errno-after-libcap-s-checks.patch
 net-ethernet-ti-davinci_mdio-add-workaround-for-erra.patch

diff --git a/queue-6.0/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch b/queue-6.0/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
deleted file mode 100644 (file)
index fc0afb1..0000000
--- a/queue-6.0/wifi-rtw88-phy-fix-warning-of-possible-buffer-overfl.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From 2714944b5a876ccb56cd7ddd6462e949a4087a90 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 27 Jul 2022 14:50:03 +0800
-Subject: wifi: rtw88: phy: fix warning of possible buffer overflow
-
-From: Zong-Zhe Yang <kevin_yang@realtek.com>
-
-[ Upstream commit 86331c7e0cd819bf0c1d0dcf895e0c90b0aa9a6f ]
-
-reported by smatch
-
-phy.c:854 rtw_phy_linear_2_db() error: buffer overflow 'db_invert_table[i]'
-8 <= 8 (assuming for loop doesn't break)
-
-However, it seems to be a false alarm because we prevent it originally via
-       if (linear >= db_invert_table[11][7])
-               return 96; /* maximum 96 dB */
-
-Still, we adjust the code to be more readable and avoid smatch warning.
-
-Signed-off-by: Zong-Zhe Yang <kevin_yang@realtek.com>
-Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
-Signed-off-by: Kalle Valo <kvalo@kernel.org>
-Link: https://lore.kernel.org/r/20220727065003.28340-5-pkshih@realtek.com
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/net/wireless/realtek/rtw88/phy.c | 21 ++++++++-------------
- 1 file changed, 8 insertions(+), 13 deletions(-)
-
-diff --git a/drivers/net/wireless/realtek/rtw88/phy.c b/drivers/net/wireless/realtek/rtw88/phy.c
-index 8982e0c98dac..da1efec0aa85 100644
---- a/drivers/net/wireless/realtek/rtw88/phy.c
-+++ b/drivers/net/wireless/realtek/rtw88/phy.c
-@@ -816,23 +816,18 @@ static u8 rtw_phy_linear_2_db(u64 linear)
-       u8 j;
-       u32 dB;
- 
--      if (linear >= db_invert_table[11][7])
--              return 96; /* maximum 96 dB */
--
-       for (i = 0; i < 12; i++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][7])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][7])
--                      break;
-+              for (j = 0; j < 8; j++) {
-+                      if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
-+                              goto cnt;
-+                      else if (i > 2 && linear <= db_invert_table[i][j])
-+                              goto cnt;
-+              }
-       }
- 
--      for (j = 0; j < 8; j++) {
--              if (i <= 2 && (linear << FRAC_BITS) <= db_invert_table[i][j])
--                      break;
--              else if (i > 2 && linear <= db_invert_table[i][j])
--                      break;
--      }
-+      return 96; /* maximum 96 dB */
- 
-+cnt:
-       if (j == 0 && i == 0)
-               goto end;
- 
--- 
-2.35.1
-