From patchwork Thu May 1 14:01:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 344522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id F1135140119; Fri, 2 May 2014 00:01:56 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WfrYh-0007Fj-Tt; Thu, 01 May 2014 14:01:55 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1WfrYD-00079W-H4 for fwts-devel@lists.ubuntu.com; Thu, 01 May 2014 14:01:25 +0000 Received: from cpc3-craw6-2-0-cust180.croy.cable.virginm.net ([77.100.248.181] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1WfrYD-0005CO-Ec for fwts-devel@lists.ubuntu.com; Thu, 01 May 2014 14:01:25 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH 10/10] lib: fwts_hwinfo: ensure buf.ifr_name is null terminated Date: Thu, 1 May 2014 15:01:21 +0100 Message-Id: <1398952881-27828-11-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.0.0.rc0 In-Reply-To: <1398952881-27828-1-git-send-email-colin.king@canonical.com> References: <1398952881-27828-1-git-send-email-colin.king@canonical.com> X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King don't strncpy the entire buffer size as this leaves no space for string terminator. Signed-off-by: Colin Ian King Acked-by: Ivan Hu Acked-by: Alex Hung --- src/lib/src/fwts_hwinfo.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/src/fwts_hwinfo.c b/src/lib/src/fwts_hwinfo.c index 3138485..6f0e5bf 100644 --- a/src/lib/src/fwts_hwinfo.c +++ b/src/lib/src/fwts_hwinfo.c @@ -380,7 +380,7 @@ static int fwts_hwinfo_net_get( } while ((d = readdir(dp)) != NULL) { - struct ifreq buf; + struct ifreq buf; struct in_addr in_addr; fwts_net_config *net_config; @@ -397,7 +397,7 @@ static int fwts_hwinfo_net_get( break; } memset(&buf, 0, sizeof(buf)); - strncpy(buf.ifr_name, d->d_name, sizeof(buf.ifr_name)); + strncpy(buf.ifr_name, d->d_name, sizeof(buf.ifr_name) - 1); if (ioctl(sock, SIOCGIFHWADDR, &buf) < 0) { fwts_log_error(fw, "Cannot get network information for device %s.", d->d_name); fwts_hwinfo_net_free(net_config); @@ -410,7 +410,7 @@ static int fwts_hwinfo_net_get( break; } memset(&buf, 0, sizeof(buf)); - strncpy(buf.ifr_name, d->d_name, sizeof(buf.ifr_name)); + strncpy(buf.ifr_name, d->d_name, sizeof(buf.ifr_name) - 1); if (ioctl(sock, SIOCGIFADDR, &buf) < 0) { if (errno != EADDRNOTAVAIL) fwts_log_error(fw, "Cannot get address for device %s.", d->d_name);