From patchwork Mon Dec 11 21:00:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Github ODP bot X-Patchwork-Id: 121462 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp3278068qgn; Mon, 11 Dec 2017 13:01:02 -0800 (PST) X-Google-Smtp-Source: ACJfBosWl8t0gXGUtDzeUGj9HahGeBrzVakY9Lf/IIVXqNjyRE3mqekzEnViDLLhTDEIrHvCLCHP X-Received: by 10.55.17.140 with SMTP id 12mr2421916qkr.229.1513026062066; Mon, 11 Dec 2017 13:01:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1513026062; cv=none; d=google.com; s=arc-20160816; b=lUrycBDzJxTBI4wgZz0uiaUwfu3lSPWTPlST0tCGVGHleHK95kAEilFIHBRBixdWs2 dpqJhGoVv51kv6lkx2i4x3QqRN/49P1kfHvFYGyX4NYP7DJgucqO1abnvpfNhwdf1TNz Den8Tq02pxtw6AG2ZCbBLdrxXtpotR+ua6FPX2Rjy4g+iL9tVqTxpg08/nOMbNtGfC3o FwuUd1uQmGPt0GMNuGvD9phQBBzQtUXnFoPdzH6zPuhIxlSNnoHCpT52MINFqqXvNdT0 3Mm73w2cwp+zMU1Cfe8T5iOQfJvppWqRNTzJCwRnWV//Tgxj1bs0PDSQg8hCWuFKoRGZ tkuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:github-pr-num :references:in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Owl4/2zxDD0wXjxRpNnBmra81aIjOAKI5ken043YfbM=; b=PGi1X6qW125htpGh3n4eSAST/4ibAunJj3mhOWO3dcmgQqInHu3O4GAPTmjS+2Mifk XZhsRGlf7e7q5zP/qayAPF1MBOomGwGD3VtTZ9scqz9lodEv73O0+rVFZGBzM9Vjbhlf 2kfQVBiPbMXlwfZS1yiIJz0c3cPby88GQYPQA11LqY2aRIzBVWr0v7W7dsOzmHbyk5WK Lm6H+DNDJSKTw1xphxmvita9u0PXIje6V2qWy3B624z61HpNvXWTK1gWMKH4PJYqmhep flj5vCMuK52+Saaugv3Z6eoY0eVYfdmueEgP0kpob6lrojTpmwAUhCTrRrSwmSn445gb kFFg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Return-Path: Received: from lists.linaro.org (ec2-54-197-127-237.compute-1.amazonaws.com. [54.197.127.237]) by mx.google.com with ESMTP id c43si989126qtd.17.2017.12.11.13.01.01; Mon, 11 Dec 2017 13:01:02 -0800 (PST) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) client-ip=54.197.127.237; Authentication-Results: mx.google.com; spf=pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.197.127.237 as permitted sender) smtp.mailfrom=lng-odp-bounces@lists.linaro.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=yandex.ru Received: by lists.linaro.org (Postfix, from userid 109) id B0960608E8; Mon, 11 Dec 2017 21:01:01 +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,FREEMAIL_FROM, 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 B6E4360953; Mon, 11 Dec 2017 21:00:29 +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 29491608CE; Mon, 11 Dec 2017 21:00:25 +0000 (UTC) Received: from forward100j.mail.yandex.net (forward100j.mail.yandex.net [5.45.198.240]) by lists.linaro.org (Postfix) with ESMTPS id D4C0D608CE for ; Mon, 11 Dec 2017 21:00:23 +0000 (UTC) Received: from mxback19j.mail.yandex.net (mxback19j.mail.yandex.net [IPv6:2a02:6b8:0:1619::95]) by forward100j.mail.yandex.net (Yandex) with ESMTP id 3C5A85D84031 for ; Tue, 12 Dec 2017 00:00:22 +0300 (MSK) Received: from smtp3o.mail.yandex.net (smtp3o.mail.yandex.net [2a02:6b8:0:1a2d::27]) by mxback19j.mail.yandex.net (nwsmtp/Yandex) with ESMTP id csN1ympRTk-0M1aBfsb; Tue, 12 Dec 2017 00:00:22 +0300 Received: by smtp3o.mail.yandex.net (nwsmtp/Yandex) with ESMTPSA id YE9KORLQTE-0LbmikBe; Tue, 12 Dec 2017 00:00:21 +0300 (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (Client certificate not present) From: Github ODP bot To: lng-odp@lists.linaro.org Date: Tue, 12 Dec 2017 00:00:18 +0300 Message-Id: <1513026020-24993-2-git-send-email-odpbot@yandex.ru> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1513026020-24993-1-git-send-email-odpbot@yandex.ru> References: <1513026020-24993-1-git-send-email-odpbot@yandex.ru> Github-pr-num: 325 Subject: [lng-odp] [PATCH v3 1/3] linux-generic: pool: validate params before creating pool 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: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" From: Bill Fischofer Enhance the check_params() routine to verify that params != NULL prior to dereferencing it. This fixes Bug https://bugs.linaro.org/show_bug.cgi?id=3465 Signed-off-by: Bill Fischofer --- /** Email created from pull request 325 (Bill-Fischofer-Linaro:bug3465) ** https://github.com/Linaro/odp/pull/325 ** Patch: https://github.com/Linaro/odp/pull/325.patch ** Base sha: 6881620135a179911a5839d4be97423a8d80e5ab ** Merge commit sha: 031d1e139f0c3b25b906fc9c79120fd327a758c4 **/ platform/linux-generic/odp_pool.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/platform/linux-generic/odp_pool.c b/platform/linux-generic/odp_pool.c index c0dd41ebf..b3c652360 100644 --- a/platform/linux-generic/odp_pool.c +++ b/platform/linux-generic/odp_pool.c @@ -352,11 +352,6 @@ static odp_pool_t pool_create(const char *name, odp_pool_param_t *params, const char *postfix = "_uarea"; char uarea_name[ODP_POOL_NAME_LEN + sizeof(postfix)]; - if (params == NULL) { - ODP_ERR("No params"); - return ODP_POOL_INVALID; - } - align = 0; if (params->type == ODP_POOL_BUFFER) @@ -533,7 +528,7 @@ static int check_params(odp_pool_param_t *params) { odp_pool_capability_t capa; - if (odp_pool_capability(&capa) < 0) + if (!params || odp_pool_capability(&capa) < 0) return -1; switch (params->type) { @@ -603,7 +598,7 @@ odp_pool_t odp_pool_create(const char *name, odp_pool_param_t *params) if (check_params(params)) return ODP_POOL_INVALID; - if (params && (params->type == ODP_POOL_PACKET)) + if (params->type == ODP_POOL_PACKET) shm_flags = ODP_SHM_PROC; return pool_create(name, params, shm_flags);