commit a6057c1e9bda9a93457a0da3a607af417c277102
Author: Jan Rękorajski <bagg...@pld-linux.org>
Date: Sun Mar 17 00:18:46 2024 +0100
- update str(l|s)cpy usage
kernel-strcpy.patch | 33 +++++++++++++++++++++++++++++++++
rtl8812au.spec | 2 ++
2 files changed, 35 insertions(+)
---
diff --git a/rtl8812au.spec b/rtl8812au.spec
index a680df1..0d8e542 100644
--- a/rtl8812au.spec
+++ b/rtl8812au.spec
@@ -19,6 +19,7 @@ Group: Base/Kernel
Source0:
https://github.com/morrownr/8812au-%{basever}/archive/main/%{pname}-%{version}.tar.gz
# Source0-md5: 6c0437ca8846ac06b939d29906658537
Patch0: no-arch-override.patch
+Patch1: kernel-strcpy.patch
# good luck finding this chip on Realtek website :/
#URL: http://www.realtek.com.tw/
URL: https://github.com/morrownr/8812au
@@ -64,6 +65,7 @@ Driver for AC1200 (802.11ac) Wireless Dual-Band USB Adapter\
%prep
%setup -q -n 8812au-%{basever}-main
%patch0 -p1
+%patch1 -p1
%build
%{expand:%build_kernel_packages}
diff --git a/kernel-strcpy.patch b/kernel-strcpy.patch
new file mode 100644
index 0000000..f94cbe7
--- /dev/null
+++ b/kernel-strcpy.patch
@@ -0,0 +1,33 @@
+diff -ur 8812au-20210629-main/os_dep/linux/os_intfs.c
8812au-20210629-main.strcpy/os_dep/linux/os_intfs.c
+--- 8812au-20210629-main/os_dep/linux/os_intfs.c 2023-12-22
22:32:11.000000000 +0100
++++ 8812au-20210629-main.strcpy/os_dep/linux/os_intfs.c 2024-03-17
00:17:00.481064694 +0100
+@@ -2056,13 +2056,13 @@
+
+ wdev = dev->ieee80211_ptr;
+ if (wdev) {
+- strlcpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name,
++ strscpy(info->driver, wiphy_dev(wdev->wiphy)->driver->name,
+ sizeof(info->driver));
+ } else {
+- strlcpy(info->driver, "N/A", sizeof(info->driver));
++ strscpy(info->driver, "N/A", sizeof(info->driver));
+ }
+
+- strlcpy(info->version, DRIVERVERSION, sizeof(info->version));
++ strscpy(info->version, DRIVERVERSION, sizeof(info->version));
+
+ padapter = (_adapter *)rtw_netdev_priv(dev);
+ if (padapter) {
+@@ -2073,10 +2073,10 @@
+ scnprintf(info->fw_version, sizeof(info->fw_version), "%d.%d",
+ hal_data->firmware_version,
hal_data->firmware_sub_version);
+ } else {
+- strlcpy(info->fw_version, "N/A", sizeof(info->fw_version));
++ strscpy(info->fw_version, "N/A", sizeof(info->fw_version));
+ }
+
+- strlcpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
++ strscpy(info->bus_info, dev_name(wiphy_dev(wdev->wiphy)),
+ sizeof(info->bus_info));
+ }
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/rtl8812au.git/commitdiff/a6057c1e9bda9a93457a0da3a607af417c277102
_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
