From patchwork Mon Aug 11 18:52:56 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 379114 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id E973B140142 for ; Tue, 12 Aug 2014 04:52:19 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754634AbaHKSvp (ORCPT ); Mon, 11 Aug 2014 14:51:45 -0400 Received: from mail-wg0-f47.google.com ([74.125.82.47]:52539 "EHLO mail-wg0-f47.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754575AbaHKSv0 (ORCPT ); Mon, 11 Aug 2014 14:51:26 -0400 Received: by mail-wg0-f47.google.com with SMTP id b13so9008061wgh.30 for ; Mon, 11 Aug 2014 11:51:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=+gv5pvq99eKekN7jsWUnk5GEoKjcHoQy0bpICzBxyjA=; b=cW8ZDGYR7qB/r58b3D732hcb+qHagj4fPGK7LytiCm/cUmXVE5h2m+VkJpt946xTbs /H5HyqlN6Nxlz8QMaKXH4NkC0HI8CxRMT6N/zXZBhgF/KD7J+yF1pz34NeNfZW7U6wx/ q1o11pBedeIEXO/P1t/BEbZMhwFdduFeCaVVliTc3zvXmlotsrt+G96IjdFXcQ5ecuc5 z1HkGIZQzo1noPJ65sgG9GZGODU3BP+pGR8piuzeBdd7e44Hp4d/Vh6Jz6nc6/CQDn5L AmVsEj4gEDVMU6uixmTS2u8Yaf7pxEYT7Mmh9NDylRyA/mMWkHcXeSWFMpM2M5W80Qm3 W28Q== X-Gm-Message-State: ALoCoQm2o+kt1eplWpQCyJvkBEPa0I60rucmTZIpARBiRjuw2KAxLWdY92Y5cDM2LZlrUzhUnIkj X-Received: by 10.194.205.129 with SMTP id lg1mr1326818wjc.97.1407783085434; Mon, 11 Aug 2014 11:51:25 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id xw9sm3519986wjc.32.2014.08.11.11.51.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 11 Aug 2014 11:51:24 -0700 (PDT) From: Rickard Strandqvist To: Stanislav Yakovlev , "John W. Linville" Cc: Rickard Strandqvist , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: wireless: ipw2x00: ipw2200.c: Cleaning up missing null-terminate in conjunction with strncpy Date: Mon, 11 Aug 2014 20:52:56 +0200 Message-Id: <1407783176-31297-2-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1407783176-31297-1-git-send-email-rickard_strandqvist@spectrumdigital.se> References: <1407783176-31297-1-git-send-email-rickard_strandqvist@spectrumdigital.se> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Replacing strncpy with strlcpy to avoid strings that lacks null terminate. Signed-off-by: Rickard Strandqvist --- 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 c5aa404..5fb1b5d 100644 --- a/drivers/net/wireless/ipw2x00/ipw2200.c +++ b/drivers/net/wireless/ipw2x00/ipw2200.c @@ -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 "