From patchwork Thu May 11 11:02:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Miller X-Patchwork-Id: 24240 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 6661858D1; Thu, 11 May 2017 13:02:33 +0200 (CEST) Received: from mail-qk0-f193.google.com (mail-qk0-f193.google.com [209.85.220.193]) by dpdk.org (Postfix) with ESMTP id B388F14EC for ; Thu, 11 May 2017 13:02:32 +0200 (CEST) Received: by mail-qk0-f193.google.com with SMTP id u75so3106874qka.1 for ; Thu, 11 May 2017 04:02:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=atomicrules-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id; bh=INsJY+CnUfGyyCyTWAmsiiY3qijs3TDCrdvL0NTD2vs=; b=ckXQm6DXA0BX55yfLjpKAqRWgfjoCazIMVvz7+JxaxSgrVnLJDK4si2NrxHgyjQyyn q69mToo+nymq13/pB16d9EwqgP2HfJW7gsBC2/uhPt6sPG+uunjdwsYy/pgcYpcDZaRV VHV8YFBzg82G5rNaJ7mFdIdEk3xwgI16myRpHs0Khd9YkQE13hkGeCvbHb7YqsTXpC3Y Wah1vvETkkkPc3jCm+0rRMMNvUwQiYypHfo7i0qiGmuqDDgBehZ++IeFRebYEnN9mykG 5TII2Mu2D4Utl46w+sK4e9GYKk2oQED7zTrF1Uq3St58elEVHOLa+kXFTnGCkMSBSgbQ fjgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=INsJY+CnUfGyyCyTWAmsiiY3qijs3TDCrdvL0NTD2vs=; b=KHcXO5L7jBhc5dpg3krNh6M9HYHLggueB0Fm42SR1RLAphcfyAwxKYMyBmxc569QgE WQndocDrfoqz1yHo394BGzJ7qMuWcaulyp/ZWf73WP2Cg7bSd7xBvojmD9ismUJ02rlp gIzwRvMwQ4wVGjGswpr0AJCnZ2F0RXZ2yzzJvk817xWrubufaNLOBOFhFckXoun7LfSh s2tVCldb10jKHVAwxvlrcboMFisurwxM/gKK1e+cucpeDMnZQnjteqUNP08iMcaIiv+0 2LZ1Zy6yP7F7DDn3OyQFslyqmMYrgJoSKS6XxdStORukSyaIok+7QZzV73cbelNX6a/O rUBA== X-Gm-Message-State: AODbwcC+KGmj3ks0CLK7ykEYNVW1vEyb/k/T/WJqNedm96lkKUqde9YK es5Ymh2obV4B+Vwz X-Received: by 10.55.24.9 with SMTP id j9mr9314806qkh.25.1494500551732; Thu, 11 May 2017 04:02:31 -0700 (PDT) Received: from LOT3.Home (h69-21-89-58.cntcnh.dsl.dynamic.tds.net. [69.21.89.58]) by smtp.gmail.com with ESMTPSA id z63sm951161qkc.6.2017.05.11.04.02.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 11 May 2017 04:02:31 -0700 (PDT) From: John Miller To: dev@dpdk.org Cc: shepard.siegel@atomicrules.com, ed.czeck@atomicrules.com, John Miller Date: Thu, 11 May 2017 07:02:28 -0400 Message-Id: <1494500548-12411-1-git-send-email-john.miller@atomicrules.com> X-Mailer: git-send-email 1.9.1 Subject: [dpdk-dev] [PATCH] net/ark: fix for Coverity issues X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fixes: 9c7188a68d7b ("net/ark: provide API for hardware modules pktchkr and pktgen") Coverity issue: 144513 Fixes: 727b3fe292bc ("net/ark: integrate PMD") Coverity issue: 144514 Fixes: 9c7188a68d7b ("net/ark: provide API for hardware modules pktchkr and pktgen") Coverity issue: 144512 Fixes: 1131cbf0fb2b ("net/ark: stub PMD for Atomic Rules Arkville") Coverity issue: 144517 Fixes: 727b3fe292bc ("net/ark: integrate PMD") Coverity issue: 144520 Signed-off-by: John Miller --- drivers/net/ark/ark_ethdev.c | 18 ++++++++++++------ drivers/net/ark/ark_pktchkr.c | 3 ++- drivers/net/ark/ark_pktgen.c | 3 ++- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/drivers/net/ark/ark_ethdev.c b/drivers/net/ark/ark_ethdev.c index 995c93d..5f00a02 100644 --- a/drivers/net/ark/ark_ethdev.c +++ b/drivers/net/ark/ark_ethdev.c @@ -516,11 +516,7 @@ static void eth_ark_macaddr_remove(struct rte_eth_dev *dev, dev->dev_ops = NULL; dev->rx_pkt_burst = NULL; dev->tx_pkt_burst = NULL; - if (dev->data->mac_addrs) - rte_free(dev->data->mac_addrs); - if (dev->data) - rte_free(dev->data); - + rte_free(dev->data->mac_addrs); return 0; } @@ -588,7 +584,11 @@ static void eth_ark_macaddr_remove(struct rte_eth_dev *dev, /* Delay packet generatpr start allow the hardware to be ready * This is only used for sanity checking with internal generator */ - pthread_create(&thread, NULL, delay_pg_start, ark); + if (pthread_create(&thread, NULL, delay_pg_start, ark)) { + PMD_DRV_LOG(ERR, "Could not create pktgen " + "starter thread\n"); + return -1; + } } if (ark->user_ext.dev_start) @@ -899,6 +899,12 @@ static void eth_ark_macaddr_remove(struct rte_eth_dev *dev, int size = 0; int first = 1; + if (file == NULL) { + PMD_DRV_LOG(ERR, "Unable to open, " + "config file %s\n", value); + return -1; + } + while (fgets(line, sizeof(line), file)) { size += strlen(line); if (size >= ARK_MAX_ARG_LEN) { diff --git a/drivers/net/ark/ark_pktchkr.c b/drivers/net/ark/ark_pktchkr.c index 62b3673..e933026 100644 --- a/drivers/net/ark/ark_pktchkr.c +++ b/drivers/net/ark/ark_pktchkr.c @@ -372,7 +372,8 @@ struct OPTIONS { o->v.INT = atoll(val); break; case OTSTRING: - strncpy(o->v.STR, val, ARK_MAX_STR_LEN); + strncpy(o->v.STR, val, ARK_MAX_STR_LEN - 1); + o->v.STR[ARK_MAX_STR_LEN - 1] = 0; break; } return 1; diff --git a/drivers/net/ark/ark_pktgen.c b/drivers/net/ark/ark_pktgen.c index bdac054..7308f14 100644 --- a/drivers/net/ark/ark_pktgen.c +++ b/drivers/net/ark/ark_pktgen.c @@ -354,7 +354,8 @@ struct OPTIONS { o->v.INT = atoll(val); break; case OTSTRING: - strncpy(o->v.STR, val, ARK_MAX_STR_LEN); + strncpy(o->v.STR, val, ARK_MAX_STR_LEN - 1); + o->v.STR[ARK_MAX_STR_LEN - 1] = 0; break; } return 1;