[wl-kmod] Add patch for GCC >= 8 - fix strncpy truncation compiler warnings

commit ef3d6e69c341c0bbab7d3ca7c1a2ea0a92d03744 Author: Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; Date: Thu Apr 19 19:56:08 2018 +0200 Add patch for GCC >= 8 - fix strncpy truncation compiler warnings wl-kmod-013_gcc8_fix_bounds_check_warnings.patch | 18 ++++++++++++++++++ wl-kmod.spec | 7 ++++++- 2 files changed, 24 insertions(+), 1 deletion(-) --- diff --git a/wl-kmod-013_gcc8_fix_bounds_check_warnings.patch b/wl-kmod-013_gcc8_fix_bounds_check_warnings.patch new file mode 100644 index 0000000..625326c --- /dev/null +++ b/wl-kmod-013_gcc8_fix_bounds_check_warnings.patch @@ -0,0 +1,18 @@ +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_271.orig/src/wl/sys/wl_linux.c 2018-02-15 00:54:30.184690464 +0100 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_271/src/wl/sys/wl_linux.c 2018-04-18 08:07:30.068342420 +0200 +@@ -2986,7 +2986,14 @@ + } + + ASSERT(strlen(wlif->name) > 0); ++#if __GNUC__ < 8 + strncpy(wlif->dev->name, wlif->name, strlen(wlif->name)); ++#else ++ // Should have been: ++ // strncpy(wlif->dev->name, wlif->name, sizeof(wlif->dev->name) - 1); ++ // wlif->dev->name[sizeof(wlif->dev->name) - 1] = '\0'; ++ memcpy(wlif->dev->name, wlif->name, strlen(wlif->name)); ++#endif + + wl->monitor_dev = dev; + if (wl->monitor_type == 1) diff --git a/wl-kmod.spec b/wl-kmod.spec index 0854399..065e94d 100644 --- a/wl-kmod.spec +++ b/wl-kmod.spec @@ -8,7 +8,7 @@ Name: wl-kmod Version: 6.30.223.271 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Kernel module for Broadcom wireless devices Group: System Environment/Kernel License: Redistributable, no modification permitted @@ -28,6 +28,7 @@ Patch8: wl-kmod-009_kernel_4.11_remove_last_rx_in_net_device_struct.patch Patch9: wl-kmod-010_kernel_4.12_add_cfg80211_roam_info_struct.patch Patch10: wl-kmod-011_kernel_4.14_new_kernel_read_function_prototype.patch Patch11: wl-kmod-012_kernel_4.15_new_timer.patch +Patch12: wl-kmod-013_gcc8_fix_bounds_check_warnings.patch # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i686 x86_64 @@ -80,6 +81,7 @@ pushd %{name}-%{version}-src %patch9 -p1 -b .kernel_4.12_add_cfg80211_roam_info_struct %patch10 -p1 -b .kernel_4.14_new_kernel_read_function_prototype %patch11 -p1 -b .kernel_4.15_new_timer +%patch12 -p1 -b .gcc8_fix_bounds_check_warnings popd for kernel_version in %{?kernel_versions} ; do @@ -109,6 +111,9 @@ chmod 0755 $RPM_BUILD_ROOT%{kmodinstdir_prefix}*%{kmodinstdir_postfix}/* || : rm -rf $RPM_BUILD_ROOT %changelog +* Tue Apr 17 2018 Nicolas Viéville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 6.30.223.271-18 +- Add patch for GCC >= 8 - fix strncpy truncation compiler warnings + * Fri Mar 02 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com&gt; - 6.30.223.271-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild