From patchwork Mon Apr 24 14:46:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Eremin-Solenikov X-Patchwork-Id: 98049 Delivered-To: patch@linaro.org Received: by 10.140.109.52 with SMTP id k49csp1516685qgf; Mon, 24 Apr 2017 07:46:25 -0700 (PDT) X-Received: by 10.55.89.66 with SMTP id n63mr24482902qkb.254.1493045185272; Mon, 24 Apr 2017 07:46:25 -0700 (PDT) Return-Path: Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id s5si18236380qkf.111.2017.04.24.07.46.24; Mon, 24 Apr 2017 07:46:25 -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 sp=NONE dis=NONE) header.from=linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id C149B608FD; Mon, 24 Apr 2017 14:46:24 +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=-1.4 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RCVD_IN_SORBS_SPAM, 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 883B4608E5; Mon, 24 Apr 2017 14:46:15 +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 78AE1608E6; Mon, 24 Apr 2017 14:46:14 +0000 (UTC) Received: from mail-lf0-f46.google.com (mail-lf0-f46.google.com [209.85.215.46]) by lists.linaro.org (Postfix) with ESMTPS id 02596608DF for ; Mon, 24 Apr 2017 14:46:13 +0000 (UTC) Received: by mail-lf0-f46.google.com with SMTP id 75so75181695lfs.2 for ; Mon, 24 Apr 2017 07:46:12 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=YT2zqXdH2Qzuztc18jwQcwl5js+8fPfghblWAzLAZMg=; b=HtBpZQq5Y3ZdamlEhkE7UPDBaC0Iu1XQUfwLqwFXlFkSX1HEtzLeAXUHYZJex4Son/ p7XropOgJ1GYqYvtD+y7VAkCw6v9rXT4Al0us2Dt9s/ba+6TheR3g2XQlzdUiUoRjDdT vhbEEpuBqnjP1msurysai2bHc0poH9iLIT7nqY7NN5bedRrsRiGCoP+XyoS4+zrgHzoj e6tpEOUzMroZyanROLJ/IVopgfvTLz25+efuxJaNp5d8lkJB+esm8kteugbAoTgzHvAX fIOcIwfQ6+XG9yVpB/f2TXynXSu9d8C2JWBv8HGYkQyOTBuV5LadoTRh7uOtpuIxYN3Z Yang== X-Gm-Message-State: AN3rC/7orE+sc9P/1x8CMOesuqSGCZ7+gYKza94FptbNqnVcCMPjJDcc Sriz5qsMgfL0Um22PArN6YX9 X-Received: by 10.25.115.212 with SMTP id h81mr8825127lfk.108.1493045171560; Mon, 24 Apr 2017 07:46:11 -0700 (PDT) Received: from forlindon.lumag.auriga.ru ([188.162.65.92]) by smtp.gmail.com with ESMTPSA id e25sm3349309ljb.17.2017.04.24.07.46.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Apr 2017 07:46:10 -0700 (PDT) From: Dmitry Eremin-Solenikov To: lng-odp@lists.linaro.org Date: Mon, 24 Apr 2017 17:46:08 +0300 Message-Id: <20170424144608.27695-1-dmitry.ereminsolenikov@linaro.org> X-Mailer: git-send-email 2.11.0 Subject: [lng-odp] [PATCH v4] linux-generic: crypto: properly handle errors in packet copy 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" Add proper handling for errors returned by odp_packet_copy_from_pkt(). Signed-off-by: Dmitry Eremin-Solenikov --- platform/linux-generic/odp_crypto.c | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) -- 2.11.0 Reviewed-by: Bill Fischofer Reviewed-by: Balasubramanian Manoharan diff --git a/platform/linux-generic/odp_crypto.c b/platform/linux-generic/odp_crypto.c index 54b222fd..83122800 100644 --- a/platform/linux-generic/odp_crypto.c +++ b/platform/linux-generic/odp_crypto.c @@ -871,14 +871,17 @@ odp_crypto_operation(odp_crypto_op_param_t *param, odp_crypto_alg_err_t rc_auth = ODP_CRYPTO_ALG_ERR_NONE; odp_crypto_generic_session_t *session; odp_crypto_op_result_t local_result; + odp_bool_t allocated = false; session = (odp_crypto_generic_session_t *)(intptr_t)param->session; /* Resolve output buffer */ if (ODP_PACKET_INVALID == param->out_pkt && - ODP_POOL_INVALID != session->p.output_pool) + ODP_POOL_INVALID != session->p.output_pool) { param->out_pkt = odp_packet_alloc(session->p.output_pool, odp_packet_len(param->pkt)); + allocated = true; + } if (odp_unlikely(ODP_PACKET_INVALID == param->out_pkt)) { ODP_DBG("Alloc failed.\n"); @@ -886,11 +889,16 @@ odp_crypto_operation(odp_crypto_op_param_t *param, } if (param->pkt != param->out_pkt) { - (void)odp_packet_copy_from_pkt(param->out_pkt, + int ret; + + ret = odp_packet_copy_from_pkt(param->out_pkt, 0, param->pkt, 0, odp_packet_len(param->pkt)); + if (odp_unlikely(ret < 0)) + goto err; + _odp_packet_copy_md_to_packet(param->pkt, param->out_pkt); odp_packet_free(param->pkt); param->pkt = ODP_PACKET_INVALID; @@ -932,7 +940,7 @@ odp_crypto_operation(odp_crypto_op_param_t *param, op_result->result = local_result; if (odp_queue_enq(session->p.compl_queue, completion_event)) { odp_event_free(completion_event); - return -1; + goto err; } /* Indicate to caller operation was async */ @@ -940,13 +948,21 @@ odp_crypto_operation(odp_crypto_op_param_t *param, } else { /* Synchronous, simply return results */ if (!result) - return -1; + goto err; *result = local_result; /* Indicate to caller operation was sync */ *posted = 0; } return 0; + +err: + if (allocated) { + odp_packet_free(param->out_pkt); + param->out_pkt = ODP_PACKET_INVALID; + } + + return -1; } static void ODP_UNUSED openssl_thread_id(CRYPTO_THREADID ODP_UNUSED *id)