wlan: Replace snprintf with scnprintf
The function snprintf() do not write more than size bytes (including
the terminating null byte ('\0')). If the output was truncated due
to this limit then the return value is the number of characters
(excluding the terminating null byte) which would have been written
to the final string if enough space had been available. Thus, a
return value of size or more means that the output was truncated.
Change-Id: Iccf9648961e2ac9eeffa0f824a80fd3798be3870
CRs-Fixed: 548711
diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index fadebb8..edef39e 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -748,7 +748,7 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", command, rssi);
+ len = scnprintf(extra, sizeof(extra), "%s %d", command, rssi);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -807,7 +807,8 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", "GETROAMSCANPERIOD", (nEmptyScanRefreshPeriod/1000));
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETROAMSCANPERIOD", (nEmptyScanRefreshPeriod/1000));
/* Returned value is in units of seconds */
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
@@ -868,7 +869,8 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", "GETROAMSCANREFRESHPERIOD", (value/1000));
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETROAMSCANREFRESHPERIOD", (value/1000));
/* Returned value is in units of seconds */
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
@@ -945,7 +947,7 @@
else
roamMode = CFG_LFR_FEATURE_ENABLED_MIN;
- len = snprintf(extra, sizeof(extra), "%s %d", command, roamMode);
+ len = scnprintf(extra, sizeof(extra), "%s %d", command, roamMode);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1002,7 +1004,8 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", command, roamRssiDiff);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ command, roamRssiDiff);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1020,7 +1023,7 @@
tANI_U8 len = 0;
hdd_getBand_helper(pHddCtx, &band);
- len = snprintf(extra, sizeof(extra), "%s %d", command, band);
+ len = scnprintf(extra, sizeof(extra), "%s %d", command, band);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1082,10 +1085,11 @@
/* output channel list is of the format
[Number of roam scan channels][Channel1][Channel2]... */
/* copy the number of channels in the 0th index */
- len = snprintf(extra, sizeof(extra), "%s %d", command, numChannels);
+ len = scnprintf(extra, sizeof(extra), "%s %d", command, numChannels);
for (j = 0; (j < numChannels); j++)
{
- len += snprintf(extra + len, sizeof(extra) - len, " %d", ChannelList[j]);
+ len += scnprintf(extra + len, sizeof(extra) - len, " %d",
+ ChannelList[j]);
}
if (copy_to_user(priv_data.buf, &extra, len + 1))
@@ -1115,7 +1119,8 @@
goto exit;
}
- len = snprintf(extra, sizeof(extra), "%s %d", "GETCCXMODE", ccxMode);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETCCXMODE", ccxMode);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1143,7 +1148,8 @@
goto exit;
}
- len = snprintf(extra, sizeof(extra), "%s %d", "GETOKCMODE", okcMode);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETOKCMODE", okcMode);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1158,7 +1164,8 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", "GETFASTROAM", lfrMode);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETFASTROAM", lfrMode);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1173,7 +1180,8 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", "GETFASTTRANSITION", ft);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETFASTTRANSITION", ft);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1334,7 +1342,8 @@
tANI_U8 len = 0;
/* value is interms of msec */
- len = snprintf(extra, sizeof(extra), "%s %d", "GETROAMSCANCHANNELMINTIME", val);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETROAMSCANCHANNELMINTIME", val);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1405,7 +1414,8 @@
tANI_U8 len = 0;
/* value is interms of msec */
- len = snprintf(extra, sizeof(extra), "%s %d", "GETSCANCHANNELTIME", val);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETSCANCHANNELTIME", val);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1460,7 +1470,8 @@
tANI_U8 len = 0;
/* value is interms of msec */
- len = snprintf(extra, sizeof(extra), "%s %d", "GETSCANHOMETIME", val);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETSCANHOMETIME", val);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1514,7 +1525,8 @@
tANI_U8 len = 0;
/* value is interms of msec */
- len = snprintf(extra, sizeof(extra), "%s %d", "GETROAMINTRABAND", val);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ "GETROAMINTRABAND", val);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1568,7 +1580,7 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", command, val);
+ len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1640,7 +1652,7 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", command, val);
+ len = scnprintf(extra, sizeof(extra), "%s %d", command, val);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -1973,7 +1985,8 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "%s %d", command, roamScanControl);
+ len = scnprintf(extra, sizeof(extra), "%s %d",
+ command, roamScanControl);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{
VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
@@ -2045,7 +2058,7 @@
char extra[32];
tANI_U8 len = 0;
- len = snprintf(extra, sizeof(extra), "GETDWELLTIME %u\n",
+ len = scnprintf(extra, sizeof(extra), "GETDWELLTIME %u\n",
(int)pCfg->nActiveMaxChnTime);
if (copy_to_user(priv_data.buf, &extra, len + 1))
{