Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f0bd88df authored by Rickard Strandqvist's avatar Rickard Strandqvist Committed by John W. Linville
Browse files

net: wireless: ipw2x00: ipw2200.c: Cleaning up missing null-terminate in conjunction with strncpy 



Replacing strncpy with strlcpy to avoid strings that lacks null terminate.

Signed-off-by: default avatarRickard Strandqvist <rickard_strandqvist@spectrumdigital.se>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 372e3a84

drivers/net/wireless/ipw2x00/ipw2200.c

+3 −3
Original line number Diff line number Diff line
@@ -5552,7 +5552,7 @@ static int ipw_find_adhoc_network(struct ipw_priv *priv, 
			    min(network->ssid_len, priv->essid_len)))) {

			char escaped[IW_ESSID_MAX_SIZE * 2 + 1];



			strncpy(escaped,

			strlcpy(escaped,

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				sizeof(escaped));
@@ -5765,7 +5765,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
		     memcmp(network->ssid, priv->essid,

			    min(network->ssid_len, priv->essid_len)))) {

			char escaped[IW_ESSID_MAX_SIZE * 2 + 1];

			strncpy(escaped,

			strlcpy(escaped,

				print_ssid(ssid, network->ssid,

					   network->ssid_len),

				sizeof(escaped));
@@ -5782,7 +5782,7 @@ static int ipw_best_network(struct ipw_priv *priv, 
	 * testing everything else. */

	if (match->network && match->network->stats.rssi > network->stats.rssi) {

		char escaped[IW_ESSID_MAX_SIZE * 2 + 1];

		strncpy(escaped,

		strlcpy(escaped,

			print_ssid(ssid, network->ssid, network->ssid_len),

			sizeof(escaped));

		IPW_DEBUG_ASSOC("Network '%s (%pM)' excluded because "