From 20496c23b602fbc33ff16b9e9496f06da2d3471b Mon Sep 17 00:00:00 2001
From: "Lukas F. Hartmann" <lukas@mntre.com>
Date: Fri, 17 May 2024 12:52:10 +0200
Subject: [PATCH] replace all strlcpy with strscpy for 6.8 compliance

---
 CORE/HDD/src/wlan_hdd_assoc.c                  |  6 +++---
 CORE/HDD/src/wlan_hdd_cfg.c                    |  4 ++--
 CORE/HDD/src/wlan_hdd_cfg80211.c               |  2 +-
 CORE/HDD/src/wlan_hdd_dp_utils.c               |  5 ++---
 CORE/HDD/src/wlan_hdd_hostapd.c                |  2 +-
 CORE/HDD/src/wlan_hdd_ipa.c                    | 12 ++++++------
 CORE/HDD/src/wlan_hdd_main.c                   | 18 +++++++++---------
 CORE/HDD/src/wlan_hdd_oemdata.c                |  2 +-
 CORE/HDD/src/wlan_hdd_wext.c                   |  4 ++--
 CORE/SERVICES/COMMON/adf/adf_nbuf.c            |  5 ++---
 CORE/SYS/legacy/src/platform/src/VossWrapper.c |  4 ++--
 CORE/VOSS/src/vos_diag.c                       |  2 +-
 CORE/VOSS/src/vos_packet.c                     |  2 +-
 13 files changed, 33 insertions(+), 35 deletions(-)

diff --git a/CORE/HDD/src/wlan_hdd_assoc.c b/CORE/HDD/src/wlan_hdd_assoc.c
index b1cbf9539..564393de1 100644
--- a/CORE/HDD/src/wlan_hdd_assoc.c
+++ b/CORE/HDD/src/wlan_hdd_assoc.c
@@ -1122,7 +1122,7 @@ void hdd_SendFTEvent(hdd_adapter_t *pAdapter)
     vos_mem_zero(buff, IW_CUSTOM_MAX);
 
     // Sme needs to send the RIC IEs first
-    str_len = strlcpy(buff, "RIC=", IW_CUSTOM_MAX);
+    str_len = strscpy(buff, "RIC=", IW_CUSTOM_MAX);
     sme_GetRICIEs( pHddCtx->hHal, pAdapter->sessionId, (u8 *)&(buff[str_len]),
             (IW_CUSTOM_MAX - str_len), &ric_ies_length );
     if (ric_ies_length == 0)
@@ -1139,7 +1139,7 @@ void hdd_SendFTEvent(hdd_adapter_t *pAdapter)
 
     // Sme needs to provide the Auth Resp
     vos_mem_zero(buff, IW_CUSTOM_MAX);
-    str_len = strlcpy(buff, "AUTH=", IW_CUSTOM_MAX);
+    str_len = strscpy(buff, "AUTH=", IW_CUSTOM_MAX);
     sme_GetFTPreAuthResponse(pHddCtx->hHal, pAdapter->sessionId,
                             (u8 *)&buff[str_len],
                             (IW_CUSTOM_MAX - str_len),
@@ -1234,7 +1234,7 @@ hdd_SendUpdateBeaconIEsEvent(hdd_adapter_t *pAdapter,
     }
     vos_mem_zero(buff, IW_CUSTOM_MAX);
 
-    strLen = strlcpy(buff,"BEACONIEs=", IW_CUSTOM_MAX);
+    strLen = strscpy(buff,"BEACONIEs=", IW_CUSTOM_MAX);
     currentLen = strLen + 1;
 
     totalIeLen = pCsrRoamInfo->nBeaconLength - BEACON_FRAME_IES_OFFSET;
diff --git a/CORE/HDD/src/wlan_hdd_cfg.c b/CORE/HDD/src/wlan_hdd_cfg.c
index 168efec84..7a0cfdb8d 100644
--- a/CORE/HDD/src/wlan_hdd_cfg.c
+++ b/CORE/HDD/src/wlan_hdd_cfg.c
@@ -7484,7 +7484,7 @@ VOS_STATUS hdd_string_to_string_array(char *data, uint8_t *datalist,
         if ('\0' == *str) {
             /* reach the end of string */
             if ('\0' != *field) {
-              strlcpy((char *)(datalist + (num * max_len_entry)),
+              strscpy((char *)(datalist + (num * max_len_entry)),
                       field, max_len_entry);
               num++;
             }
@@ -7492,7 +7492,7 @@ VOS_STATUS hdd_string_to_string_array(char *data, uint8_t *datalist,
         }
         /* replace separator with NUL to terminate the data */
         *str++ = '\0';
-        strlcpy((char *)(datalist + (num * max_len_entry)),
+        strscpy((char *)(datalist + (num * max_len_entry)),
                 field, max_len_entry);
         num++;
     }
diff --git a/CORE/HDD/src/wlan_hdd_cfg80211.c b/CORE/HDD/src/wlan_hdd_cfg80211.c
index 7ff80f4e8..0a0e5a1ee 100644
--- a/CORE/HDD/src/wlan_hdd_cfg80211.c
+++ b/CORE/HDD/src/wlan_hdd_cfg80211.c
@@ -8261,7 +8261,7 @@ __wlan_hdd_cfg80211_get_wifi_info(struct wiphy *wiphy,
 
 	if (tb_vendor[QCA_WLAN_VENDOR_ATTR_WIFI_INFO_DRIVER_VERSION]) {
 		hddLog(LOG1, FL("Rcvd req for Driver version"));
-		strlcpy(driver_version, QWLAN_VERSIONSTR,
+		strscpy(driver_version, QWLAN_VERSIONSTR,
 			sizeof(driver_version));
 		skb_len += strlen(driver_version) + 1;
 		count++;
diff --git a/CORE/HDD/src/wlan_hdd_dp_utils.c b/CORE/HDD/src/wlan_hdd_dp_utils.c
index 0b880d11d..aa613b2aa 100644
--- a/CORE/HDD/src/wlan_hdd_dp_utils.c
+++ b/CORE/HDD/src/wlan_hdd_dp_utils.c
@@ -271,10 +271,10 @@ void hdd_dp_util_send_rps_ind(hdd_adapter_t *adapter)
 	}
 
 #ifdef SUPPORT_IFTYPE_P2P_DEVICE_VIF
-	strlcpy(rps_data.ifname, adapter->ifname,
+	strscpy(rps_data.ifname, adapter->ifname,
 		sizeof(rps_data.ifname));
 #else
-	strlcpy(rps_data.ifname, adapter->dev->name,
+	strscpy(rps_data.ifname, adapter->dev->name,
 		sizeof(rps_data.ifname));
 #endif
 	wlan_hdd_send_svc_nlink_msg(hdd_ctxt->radio_index,
@@ -282,4 +282,3 @@ void hdd_dp_util_send_rps_ind(hdd_adapter_t *adapter)
 			&rps_data, sizeof(rps_data));
 }
 #endif /* QCA_FEATURE_RPS */
-
diff --git a/CORE/HDD/src/wlan_hdd_hostapd.c b/CORE/HDD/src/wlan_hdd_hostapd.c
index 0f65e4163..2ed02918c 100644
--- a/CORE/HDD/src/wlan_hdd_hostapd.c
+++ b/CORE/HDD/src/wlan_hdd_hostapd.c
@@ -8997,7 +8997,7 @@ hdd_adapter_t* hdd_wlan_create_ap_dev(hdd_context_t *pHddCtx,
                                       (int)vos_get_concurrency_mode());
 
         //Init the net_device structure
-        strlcpy(pWlanHostapdDev->name, (const char *)iface_name, IFNAMSIZ);
+        strscpy(pWlanHostapdDev->name, (const char *)iface_name, IFNAMSIZ);
 
         hdd_set_ap_ops( pHostapdAdapter->dev );
 
diff --git a/CORE/HDD/src/wlan_hdd_ipa.c b/CORE/HDD/src/wlan_hdd_ipa.c
index 4e3daec67..16e55f475 100644
--- a/CORE/HDD/src/wlan_hdd_ipa.c
+++ b/CORE/HDD/src/wlan_hdd_ipa.c
@@ -2221,7 +2221,7 @@ static int hdd_ipa_uc_send_evt(hdd_adapter_t *adapter,
 	}
 
 	meta.msg_type = type;
-	strlcpy(msg->name, adapter->dev->name,
+	strscpy(msg->name, adapter->dev->name,
 		IPA_RESOURCE_NAME_MAX);
 	memcpy(msg->mac_addr, mac_addr, ETH_ALEN);
 	HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: Evt: %d",
@@ -3905,7 +3905,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa,
 #else
 	tx_prop[IPA_IP_v4].dst_pipe = iface_context->cons_client;
 #endif
-	strlcpy(tx_prop[IPA_IP_v4].hdr_name, ipv4_hdr_name,
+	strscpy(tx_prop[IPA_IP_v4].hdr_name, ipv4_hdr_name,
 			IPA_RESOURCE_NAME_MAX);
 	tx_intf.num_props++;
 
@@ -3918,7 +3918,7 @@ static int hdd_ipa_register_interface(struct hdd_ipa_priv *hdd_ipa,
 #else
 		tx_prop[IPA_IP_v6].dst_pipe = iface_context->cons_client;
 #endif
-		strlcpy(tx_prop[IPA_IP_v6].hdr_name, ipv6_hdr_name,
+		strscpy(tx_prop[IPA_IP_v6].hdr_name, ipv6_hdr_name,
 				IPA_RESOURCE_NAME_MAX);
 		tx_intf.num_props++;
 	}
@@ -3942,7 +3942,7 @@ static void hdd_remove_ipa_header(char *name)
 	struct ipa_ioc_del_hdr *ipa_hdr;
 
 	adf_os_mem_zero(&hdrlookup, sizeof(hdrlookup));
-	strlcpy(hdrlookup.name, name, sizeof(hdrlookup.name));
+	strscpy(hdrlookup.name, name, sizeof(hdrlookup.name));
 	ret = ipa_get_hdr(&hdrlookup);
 	if (ret) {
 		HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "Hdr deleted already %s, %d",
@@ -4690,7 +4690,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 					"msg_ex allocation failed");
 			return -ENOMEM;
 		}
-		strlcpy(msg_ex->name, adapter->dev->name,
+		strscpy(msg_ex->name, adapter->dev->name,
 				IPA_RESOURCE_NAME_MAX);
 		msg_ex->num_of_attribs = 1;
 		msg_ex->attribs[0].attrib_type = WLAN_HDR_ATTRIB_MAC_ADDR;
@@ -4769,7 +4769,7 @@ int hdd_ipa_wlan_evt(hdd_adapter_t *adapter, uint8_t sta_id,
 	}
 
 	meta.msg_type = type;
-	strlcpy(msg->name, adapter->dev->name, IPA_RESOURCE_NAME_MAX);
+	strscpy(msg->name, adapter->dev->name, IPA_RESOURCE_NAME_MAX);
 	memcpy(msg->mac_addr, mac_addr, ETH_ALEN);
 
 	HDD_IPA_LOG(VOS_TRACE_LEVEL_INFO, "%s: Evt: %d",
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index 1012aa69b..fcb714a9f 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -11171,7 +11171,7 @@ hdd_alloc_p2p_device_adapter(hdd_context_t *pHddCtx, tSirMacAddr macAddr,
 		     sizeof(tSirMacAddr));
 	vos_mem_copy(pAdapter->wdev.address, macAddr, sizeof(tSirMacAddr));
 
-	strlcpy(pAdapter->ifname, name, IFNAMSIZ);
+	strscpy(pAdapter->ifname, name, IFNAMSIZ);
 	/*
 	* kernel will consume ethernet header length buffer for hard_header,
 	* so just reserve it
@@ -11227,10 +11227,10 @@ static hdd_adapter_t* hdd_alloc_station_adapter(hdd_context_t *pHddCtx,
       pAdapter->isLinkUpSvcNeeded = FALSE;
       pAdapter->higherDtimTransition = eANI_BOOLEAN_TRUE;
       //Init the net_device structure
-      strlcpy(pWlanDev->name, name, IFNAMSIZ);
+      strscpy(pWlanDev->name, name, IFNAMSIZ);
 
 #ifdef SUPPORT_IFTYPE_P2P_DEVICE_VIF
-      strlcpy(pAdapter->ifname, name, IFNAMSIZ);
+      strscpy(pAdapter->ifname, name, IFNAMSIZ);
 #endif
 
       //vos_mem_copy(pWlanDev->dev_addr, (void *)macAddr, sizeof(tSirMacAddr));
@@ -11304,7 +11304,7 @@ static hdd_adapter_t *hdd_alloc_monitor_adapter(hdd_context_t *pHddCtx,
 	   pAdapter->isLinkUpSvcNeeded = FALSE;
 	   pAdapter->higherDtimTransition = eANI_BOOLEAN_TRUE;
 	   /* Init the net_device structure */
-	   strlcpy(pwlan_dev->name, name, IFNAMSIZ);
+	   strscpy(pwlan_dev->name, name, IFNAMSIZ);
 
 	   //vos_mem_copy(pwlan_dev->dev_addr,
      //	(void *)macAddr, sizeof(tSirMacAddr));
@@ -18880,7 +18880,7 @@ static int fwpath_changed_handler(const char *kmessage,
 		pr_info("%s : new_mode : %s, present_mode : %s\n", __func__,
 			kmessage, fwpath_mode_local);
 
-		strlcpy(fwpath_mode_local, kmessage,
+		strscpy(fwpath_mode_local, kmessage,
 			sizeof(fwpath_mode_local));
 
 		ready = vos_is_load_unload_ready(__func__);
@@ -19852,12 +19852,12 @@ int wlan_hdd_gen_wlan_version_pack(struct wlan_version_data *data,
     }
 
     data->chip_id = chip_id;
-    strlcpy(data->chip_name, chip_name, WLAN_SVC_MAX_STR_LEN);
+    strscpy(data->chip_name, chip_name, WLAN_SVC_MAX_STR_LEN);
     if (strncmp(chip_name, "Unknown", 7))
-        strlcpy(data->chip_from, "Qualcomm", WLAN_SVC_MAX_STR_LEN);
+        strscpy(data->chip_from, "Qualcomm", WLAN_SVC_MAX_STR_LEN);
     else
-        strlcpy(data->chip_from, "Unknown", WLAN_SVC_MAX_STR_LEN);
-    strlcpy(data->host_version, QWLAN_VERSIONSTR, WLAN_SVC_MAX_STR_LEN);
+        strscpy(data->chip_from, "Unknown", WLAN_SVC_MAX_STR_LEN);
+    strscpy(data->host_version, QWLAN_VERSIONSTR, WLAN_SVC_MAX_STR_LEN);
     scnprintf(data->fw_version, WLAN_SVC_MAX_STR_LEN, "%d.%d.%d.%d",
               (fw_version & 0xf0000000) >> 28,
               (fw_version & 0xf000000) >> 24,
diff --git a/CORE/HDD/src/wlan_hdd_oemdata.c b/CORE/HDD/src/wlan_hdd_oemdata.c
index 2e6072fab..8492a96e7 100644
--- a/CORE/HDD/src/wlan_hdd_oemdata.c
+++ b/CORE/HDD/src/wlan_hdd_oemdata.c
@@ -81,7 +81,7 @@ static int populate_oem_data_cap(hdd_adapter_t *adapter,
 		return -ENOMEM;
 	}
 
-	strlcpy(data_cap->oem_target_signature, OEM_TARGET_SIGNATURE,
+	strscpy(data_cap->oem_target_signature, OEM_TARGET_SIGNATURE,
 		OEM_TARGET_SIGNATURE_LEN);
 	data_cap->oem_target_type = hdd_ctx->target_type;
 	data_cap->oem_fw_version = hdd_ctx->target_fw_version;
diff --git a/CORE/HDD/src/wlan_hdd_wext.c b/CORE/HDD/src/wlan_hdd_wext.c
index 3bb102e29..c0267daf6 100644
--- a/CORE/HDD/src/wlan_hdd_wext.c
+++ b/CORE/HDD/src/wlan_hdd_wext.c
@@ -2048,7 +2048,7 @@ static int __iw_get_name(struct net_device *dev,
 			 char *wrqu, char *extra)
 {
 	ENTER();
-	strlcpy(wrqu, "Qcom:802.11n", IFNAMSIZ);
+	strscpy(wrqu, "Qcom:802.11n", IFNAMSIZ);
 	EXIT();
 	return 0;
 }
@@ -3548,7 +3548,7 @@ void hdd_tx_per_hit_cb (void *pCallbackContext)
         return;
     }
     memset(&wrqu, 0, sizeof(wrqu));
-    wrqu.data.length = strlcpy(tx_fail, "TX_FAIL", sizeof(tx_fail));
+    wrqu.data.length = strscpy(tx_fail, "TX_FAIL", sizeof(tx_fail));
     wireless_send_event(pAdapter->dev, IWEVCUSTOM, &wrqu, tx_fail);
 }
 
diff --git a/CORE/SERVICES/COMMON/adf/adf_nbuf.c b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
index 24899b60f..05313d906 100644
--- a/CORE/SERVICES/COMMON/adf/adf_nbuf.c
+++ b/CORE/SERVICES/COMMON/adf/adf_nbuf.c
@@ -444,7 +444,7 @@ adf_nbuf_history_add(adf_nbuf_t nbuf, const char *file, uint32_t line,
 	struct adf_nbuf_event *event = &adf_nbuf_history[idx];
 
 	event->nbuf = nbuf;
-	strlcpy(event->file, kbasename(file), ADF_MEM_FILE_NAME_SIZE);
+	strscpy(event->file, kbasename(file), ADF_MEM_FILE_NAME_SIZE);
 	event->line = line;
 	event->type = type;
 	event->timestamp = adf_os_ticks();
@@ -722,7 +722,7 @@ adf_nbuf_track_map(adf_nbuf_t nbuf, const char *file, uint32_t line)
 	}
 
 	meta->nbuf = nbuf;
-	strlcpy(meta->file, kbasename(file), ADF_MEM_FILE_NAME_SIZE);
+	strscpy(meta->file, kbasename(file), ADF_MEM_FILE_NAME_SIZE);
 	meta->line = line;
 
 	adf_os_spin_lock_irqsave(&adf_nbuf_map_lock);
@@ -2520,4 +2520,3 @@ bool __adf_nbuf_is_bcast_pkt(uint8_t *data)
 
 	return false;
 }
-
diff --git a/CORE/SYS/legacy/src/platform/src/VossWrapper.c b/CORE/SYS/legacy/src/platform/src/VossWrapper.c
index 785266780..fe34e35e5 100644
--- a/CORE/SYS/legacy/src/platform/src/VossWrapper.c
+++ b/CORE/SYS/legacy/src/platform/src/VossWrapper.c
@@ -344,7 +344,7 @@ v_UINT_t tx_timer_create_intern_debug( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr
 
 #ifdef WLAN_DEBUG
     // Store the timer name
-    strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
+    strscpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
 #endif // Store the timer name, for Debug build only
 
     status = vos_timer_init_debug( &timer_ptr->vosTimer, VOS_TIMER_TYPE_SW,
@@ -403,7 +403,7 @@ v_UINT_t tx_timer_create_intern( v_PVOID_t pMacGlobal, TX_TIMER *timer_ptr,
 
 #ifdef WLAN_DEBUG
     // Store the timer name
-    strlcpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
+    strscpy(timer_ptr->timerName, name_ptr, sizeof(timer_ptr->timerName));
 #endif // Store the timer name, for Debug build only
 
     status = vos_timer_init( &timer_ptr->vosTimer, VOS_TIMER_TYPE_SW,
diff --git a/CORE/VOSS/src/vos_diag.c b/CORE/VOSS/src/vos_diag.c
index 74d3a6e0b..a095fa4de 100644
--- a/CORE/VOSS/src/vos_diag.c
+++ b/CORE/VOSS/src/vos_diag.c
@@ -216,7 +216,7 @@ void vos_log_wlock_diag(uint32_t reason, const char *wake_lock_name,
 	wlan_diag_event.reason = reason;
 	wlan_diag_event.timeout = timeout;
 	wlan_diag_event.name_len = strlen(wake_lock_name);
-	strlcpy(&wlan_diag_event.name[0],
+	strscpy(&wlan_diag_event.name[0],
 		wake_lock_name,
 		wlan_diag_event.name_len+1);
 
diff --git a/CORE/VOSS/src/vos_packet.c b/CORE/VOSS/src/vos_packet.c
index f20e40420..bc4d6183b 100644
--- a/CORE/VOSS/src/vos_packet.c
+++ b/CORE/VOSS/src/vos_packet.c
@@ -350,7 +350,7 @@ void vos_pkt_trace_buf_update
    ktime_get_real_ts64(&tv);
    trace_buffer[slot].event_sec_time = tv.tv_sec;
    trace_buffer[slot].event_msec_time = tv.tv_nsec / 1000;
-   strlcpy(trace_buffer[slot].event_string, event_string,
+   strscpy(trace_buffer[slot].event_string, event_string,
           sizeof(trace_buffer[slot].event_string));
 
    return;
-- 
GitLab