From patchwork Sun Sep 14 17:33:43 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rickard Strandqvist X-Patchwork-Id: 389081 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 627CD1400D5 for ; Mon, 15 Sep 2014 03:32:11 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753082AbaINRby (ORCPT ); Sun, 14 Sep 2014 13:31:54 -0400 Received: from mail-la0-f50.google.com ([209.85.215.50]:43589 "EHLO mail-la0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753069AbaINRbx (ORCPT ); Sun, 14 Sep 2014 13:31:53 -0400 Received: by mail-la0-f50.google.com with SMTP id ty20so3434179lab.23 for ; Sun, 14 Sep 2014 10:31:52 -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; bh=LQq31N1XZEjj1EXEswMjoB4ElmfO41v8lEufBAej2Dc=; b=IgBRSaAXHG4dtIYBdabFVvkzcS/FhKyWSv2P7NepZp4Z9AkevTnjlr7GrIrhdlmk7M g9Noa5iVp9Q/a9q3a+oLAz2qNxvS6i+RqFjIsWtSoCXJH/6NFgnCeerp9u7rEcSdBOGR +714uEOcXXru46mFseWfrseD81LyWBpbJ/OB4iWRk1DeqN2HOeLG91sT8ey5FzQWEbCq gBUnMS5iIWb4ZHogzsZx2W5j7vI8qu+/AP2oTZlA8dggrFu0b5HGBJAiAjYulDfwxzlD U+DZTXViNiKj8K9VVQKV6mB0UWQh8MibTvy6LYkDy9tFGjOStjjjeRtx6OnLLGdJnbbN QFKQ== X-Gm-Message-State: ALoCoQldmf/TGq2iKDIhTP8IgBHeMw7sbne70sjKknw1Y3FL+yBL1QUGVM2dMpVYr/I9PRCFhP4H X-Received: by 10.112.146.103 with SMTP id tb7mr22018683lbb.26.1410715912297; Sun, 14 Sep 2014 10:31:52 -0700 (PDT) Received: from localhost.localdomain (h-245-62.a218.priv.bahnhof.se. [85.24.245.62]) by mx.google.com with ESMTPSA id pc7sm87189lbb.5.2014.09.14.10.31.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Sep 2014 10:31:51 -0700 (PDT) From: Rickard Strandqvist To: Mirko Lindner , Stephen Hemminger Cc: Rickard Strandqvist , netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] net: ethernet: marvell: sky2.c: Cleaning up missing null-terminate in conjunction with strncpy Date: Sun, 14 Sep 2014 19:33:43 +0200 Message-Id: <1410716023-16068-1-git-send-email-rickard_strandqvist@spectrumdigital.se> X-Mailer: git-send-email 1.7.10.4 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/ethernet/marvell/sky2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c index dba48a5c..7053d38 100644 --- a/drivers/net/ethernet/marvell/sky2.c +++ b/drivers/net/ethernet/marvell/sky2.c @@ -4907,7 +4907,7 @@ static const char *sky2_name(u8 chipid, char *buf, int sz) }; if (chipid >= CHIP_ID_YUKON_XL && chipid <= CHIP_ID_YUKON_OP_2) - strncpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz); + strlcpy(buf, name[chipid - CHIP_ID_YUKON_XL], sz); else snprintf(buf, sz, "(chip %#x)", chipid); return buf;