Return-path: Received: from intranet.asianux.com ([58.214.24.6]:48715 "EHLO intranet.asianux.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755664Ab3AENkZ (ORCPT ); Sat, 5 Jan 2013 08:40:25 -0500 Message-ID: <50E82D7D.4090107@asianux.com> (sfid-20130105_144034_530888_59773E25) Date: Sat, 05 Jan 2013 21:41:17 +0800 From: Chen Gang MIME-Version: 1.0 To: stas.yakovlev@gmail.com, linville@tuxdriver.com CC: linux-wireless@vger.kernel.org, netdev@vger.kernel.org Subject: [PATCH] drivers/net/wireless/ipw2x00: use strlcpy instead of strncpy Content-Type: text/plain; charset=GB2312 Sender: linux-wireless-owner@vger.kernel.org List-ID: The fields must be null-terminated, or IPW_DEBUG_ASSOC will cause issue. Signed-off-by: Chen Gang --- drivers/net/wireless/ipw2x00/ipw2200.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/ipw2x00/ipw2200.c b/drivers/net/wireless/ipw2x00/ipw2200.c index 844f201..c85261b 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -5558,7 +5558,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)); @@ -5771,7 +5771,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)); @@ -5788,7 +5788,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 " -- 1.7.10.4