From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stephen@networkplumber.org>
Received: from mail-pd0-f175.google.com (mail-pd0-f175.google.com
 [209.85.192.175]) by dpdk.org (Postfix) with ESMTP id 1431FB108
 for <dev@dpdk.org>; Tue, 24 Jun 2014 18:05:20 +0200 (CEST)
Received: by mail-pd0-f175.google.com with SMTP id v10so417081pde.20
 for <dev@dpdk.org>; Tue, 24 Jun 2014 09:05:39 -0700 (PDT)
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20130820;
 h=x-gm-message-state:date:from:to:cc:subject:message-id:in-reply-to
 :references:mime-version:content-type:content-transfer-encoding;
 bh=GTeuiaq6bu7UoFHFFYlJnNLxCQyMOsRbwapp73+tWX4=;
 b=P6YiqzBFBeyDmnJgW8+z7yRCTut14IYttms/mUcrjn8/8Q69SQkC3XK1NIv+UNAswP
 dtCiCqIsNex32hxox8StMyz9WMdFhqa9pNhMMJxFJHP2MpKRM7Hb2BPRWkbJQteJGUsT
 9dYZsxR+bOJeL0g7FcmJ8JzuPsKwJyrqu9u5jve4DlJJNMivQi6vQ7SIQMlFpxYQdRdW
 xSKDd5XAApMExI5ZgRHTYJEMh0PUCsd8tQeNhPTt/FcII4ovWaMIDv/8gdr2GNvuV6t6
 6yJsfAO1KX6ARIXQbMM9wMPOFsIEDTND2T7uzYk1zGf8sHbmZhbELxLA6yFMPmwAKjjF
 pjqw==
X-Gm-Message-State: ALoCoQmRvGUlV8mHjScQKfpSXUzapMa/Xv/g6ziYZI6sQpHlHA1567+XRhSGlaOa8V3JzaxFMYPF
X-Received: by 10.68.113.133 with SMTP id iy5mr2690257pbb.135.1403625938939;
 Tue, 24 Jun 2014 09:05:38 -0700 (PDT)
Received: from nehalam.linuxnetplumber.net
 (static-50-53-83-51.bvtn.or.frontiernet.net. [50.53.83.51])
 by mx.google.com with ESMTPSA id op3sm1061177pbc.40.2014.06.24.09.05.38
 for <multiple recipients>
 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
 Tue, 24 Jun 2014 09:05:38 -0700 (PDT)
Date: Tue, 24 Jun 2014 09:05:30 -0700
From: Stephen Hemminger <stephen@networkplumber.org>
To: Stephen Hemminger <stephen@networkplumber.org>
Message-ID: <20140624090530.56318f6f@nehalam.linuxnetplumber.net>
In-Reply-To: <20140624090253.140206a7@nehalam.linuxnetplumber.net>
References: <20140624090253.140206a7@nehalam.linuxnetplumber.net>
X-Mailer: Claws Mail 3.9.3 (GTK+ 2.24.23; x86_64-pc-linux-gnu)
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Cc: dev@dpdk.org
Subject: [dpdk-dev] [PATCH 3/3] fix incorrect snprintf usage
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: patches and discussions about DPDK <dev.dpdk.org>
List-Unsubscribe: <http://dpdk.org/ml/options/dev>,
 <mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <http://dpdk.org/ml/listinfo/dev>,
 <mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 24 Jun 2014 16:05:21 -0000

Now that snprintf is used, Gcc finds more uses of unsafe arguments.
Fix where found. These may have already been fixed by
other patches on the mailing list.

Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>


--- a/lib/librte_kni/rte_kni.c	2014-06-24 08:48:55.758031238 -0700
+++ b/lib/librte_kni/rte_kni.c	2014-06-24 08:48:55.754031210 -0700
@@ -158,7 +158,7 @@ rte_kni_alloc(struct rte_mempool *pktmbu
 		}
 	}
 
-	snprintf(intf_name, RTE_KNI_NAMESIZE, conf->name);
+	snprintf(intf_name, RTE_KNI_NAMESIZE, "%s", conf->name);
 	snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "KNI_INFO_%s", intf_name);
 	mz = kni_memzone_reserve(mz_name, sizeof(struct rte_kni),
 				SOCKET_ID_ANY, 0);
@@ -184,8 +184,8 @@ rte_kni_alloc(struct rte_mempool *pktmbu
 	dev_info.group_id = conf->group_id;
 	dev_info.mbuf_size = conf->mbuf_size;
 
-	snprintf(ctx->name, RTE_KNI_NAMESIZE, intf_name);
-	snprintf(dev_info.name, RTE_KNI_NAMESIZE, intf_name);
+	snprintf(ctx->name, RTE_KNI_NAMESIZE, "%s", intf_name);
+	snprintf(dev_info.name, RTE_KNI_NAMESIZE, "%s", intf_name);
 
 	RTE_LOG(INFO, KNI, "pci: %02x:%02x:%02x \t %02x:%02x\n",
 		dev_info.bus, dev_info.devid, dev_info.function,
@@ -291,7 +291,7 @@ rte_kni_release(struct rte_kni *kni)
 	if (!kni || !kni->in_use)
 		return -1;
 
-	snprintf(dev_info.name, sizeof(dev_info.name), kni->name);
+	snprintf(dev_info.name, sizeof(dev_info.name), "%s", kni->name);
 	if (ioctl(kni_fd, RTE_KNI_IOCTL_RELEASE, &dev_info) < 0) {
 		RTE_LOG(ERR, KNI, "Fail to release kni device\n");
 		return -1;
--- a/app/test/test_cmdline_etheraddr.c	2014-06-24 08:35:31.820146456 -0700
+++ b/app/test/test_cmdline_etheraddr.c	2014-06-24 08:54:35.396486084 -0700
@@ -147,7 +147,7 @@ test_parse_etheraddr_invalid_param(void)
 
 	/* copy string to buffer */
 	snprintf(buf, sizeof(buf), "%s",
-			ether_addr_valid_strs[0]);
+		 ether_addr_valid_strs[0].str);
 
 	ret = cmdline_parse_etheraddr(NULL, buf, NULL);
 	if (ret == -1) {
--- a/app/test/test_eal_flags.c	2014-06-24 08:35:31.820146456 -0700
+++ b/app/test/test_eal_flags.c	2014-06-24 08:53:16.623916364 -0700
@@ -268,7 +268,7 @@ get_current_prefix(char * prefix, int si
 
 	/* copy string all the way from second char up to start of _config */
 	snprintf(prefix, size, "%.*s",
-			strnlen(buf, sizeof(buf)) - sizeof("_config"), &buf[1]);
+		 (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")), &buf[1]);
 
 	return prefix;
 }
--- a/app/test/test_mp_secondary.c	2014-06-24 08:35:31.820146456 -0700
+++ b/app/test/test_mp_secondary.c	2014-06-24 08:50:27.706700011 -0700
@@ -103,7 +103,7 @@ get_current_prefix(char * prefix, int si
 
 	/* copy string all the way from second char up to start of _config */
 	snprintf(prefix, size, "%.*s",
-			strnlen(buf, sizeof(buf)) - sizeof("_config"), &buf[1]);
+		 (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")), &buf[1]);
 
 	return prefix;
 }