From patchwork Mon Apr 4 14:42:57 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bill Fischofer X-Patchwork-Id: 65001 Delivered-To: patch@linaro.org Received: by 10.112.199.169 with SMTP id jl9csp1226831lbc; Mon, 4 Apr 2016 07:43:07 -0700 (PDT) X-Received: by 10.140.144.132 with SMTP id 126mr23458530qhq.102.1459780987794; Mon, 04 Apr 2016 07:43:07 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id w187si22488441qka.61.2016.04.04.07.43.07; Mon, 04 Apr 2016 07:43:07 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 4C8D7617F0; Mon, 4 Apr 2016 14:43:07 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 9D371615E7; Mon, 4 Apr 2016 14:43:03 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 87793615FB; Mon, 4 Apr 2016 14:43:01 +0000 (UTC) Received: from mail-oi0-f51.google.com (mail-oi0-f51.google.com [209.85.218.51]) by lists.linaro.org (Postfix) with ESMTPS id 7989B6158E for ; Mon, 4 Apr 2016 14:43:00 +0000 (UTC) Received: by mail-oi0-f51.google.com with SMTP id s79so70272219oie.1 for ; Mon, 04 Apr 2016 07:43:00 -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=JWM0M/8OSAOOnIsMwdM1W6AzyIC6zgorcnQNvswfo20=; b=i5T08ElA++cGQFoCvVpUg2fAcprx4es/J7EGNfY8i3TVZ9DFwXhzLLZTMcgMh3b6Ge wocOzPWlZOHyNtz+79jaPhJhISXEuIjGQkjgAdCQ6BENa1o1q1AgvdlbpOux/+JEwqLF JO2Sk/4wIdhoBU4dIg+qyfy0+neZ266k2AfTSSPIMH61dDo15SumVN4BNGyRXKE+tR6d Fi62YL3XqAYNK5lMdm4K27B5a/E89xgmewbbBoSMVjkGLL9Pvdt6XyRnFR6AEPH6rT9C Q1/PxFQC1pYmkFeY3gHtDH050Own+Kgo5LpjlqTWWU/euYK2IP4fBj69y9HS9+S4Kb0u mSHw== X-Gm-Message-State: AD7BkJK+AcymilfN1M73rm/4oWyQwrk/QG/gMKpU1jUCX0x+Mgw48IPUw1b6qHY0y8DHQJ0xdvE= X-Received: by 10.202.79.13 with SMTP id d13mr9241164oib.31.1459780980069; Mon, 04 Apr 2016 07:43:00 -0700 (PDT) Received: from Ubuntu15.localdomain (cpe-66-68-129-43.austin.res.rr.com. [66.68.129.43]) by smtp.gmail.com with ESMTPSA id 89sm1160344otf.31.2016.04.04.07.42.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 04 Apr 2016 07:42:59 -0700 (PDT) From: Bill Fischofer To: lng-odp@lists.linaro.org Date: Mon, 4 Apr 2016 09:42:57 -0500 Message-Id: <1459780977-12430-1-git-send-email-bill.fischofer@linaro.org> X-Mailer: git-send-email 2.5.0 X-Topics: patch Subject: [lng-odp] [PATCHv4] linux-generic: pktio: avoid coverity issues by adding explicit rc check X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: "The OpenDataPlane \(ODP\) List" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" Resolve bug https://bugs.linaro.org/show_bug.cgi?id=2138 by adding an explicit rc check for odp_pktio_capability(). Signed-off-by: Bill Fischofer --- platform/linux-generic/odp_packet_io.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/platform/linux-generic/odp_packet_io.c b/platform/linux-generic/odp_packet_io.c index 9192be2..b0f3423 100644 --- a/platform/linux-generic/odp_packet_io.c +++ b/platform/linux-generic/odp_packet_io.c @@ -1027,6 +1027,7 @@ int odp_pktin_queue_config(odp_pktio_t pktio, odp_pktio_capability_t capa; unsigned num_queues; unsigned i; + int rc; odp_queue_t queue; odp_pktin_queue_param_t default_param; @@ -1059,10 +1060,15 @@ int odp_pktin_queue_config(odp_pktio_t pktio, return -1; } - odp_pktio_capability(pktio, &capa); + rc = odp_pktio_capability(pktio, &capa); - if (num_queues > capa.max_input_queues) { - ODP_DBG("pktio %s: too many input queues\n", entry->s.name); + if (rc != 0 || num_queues > capa.max_input_queues) { + if (rc != 0) + ODP_DBG("pktio %s: unable to read capabilities\n", + entry->s.name); + else + ODP_DBG("pktio %s: too many input queues\n", + entry->s.name); return -1; } @@ -1135,6 +1141,7 @@ int odp_pktout_queue_config(odp_pktio_t pktio, odp_pktio_capability_t capa; unsigned num_queues; unsigned i; + int rc; odp_pktout_queue_param_t default_param; if (param == NULL) { @@ -1172,10 +1179,15 @@ int odp_pktout_queue_config(odp_pktio_t pktio, return -1; } - odp_pktio_capability(pktio, &capa); + rc = odp_pktio_capability(pktio, &capa); - if (num_queues > capa.max_output_queues) { - ODP_DBG("pktio %s: too many output queues\n", entry->s.name); + if (rc != 0 || num_queues > capa.max_output_queues) { + if (rc != 0) + ODP_DBG("pktio %s: unable to read capabilities\n", + entry->s.name); + else + ODP_DBG("pktio %s: too many output queues\n", + entry->s.name); return -1; }