On Sat, 2013-01-05 at 21:41 +0800, Chen Gang wrote:
> The fields must be null-terminated, or IPW_DEBUG_ASSOC will cause issue.
[]
> diff --git 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 "
This happens because escaped is declared the wrong size.
It'd be better to change
char escaped[IW_ESSID_MAX_SIZE * 2 + 1];
to
DECLARE_SSID_BUF(escaped);
and use
print_ssid(escaped, network->ssid, network->ssid_len)
in the debug.
--
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
