Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/69720/?format=api
http://patches.dpdk.org/api/patches/69720/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200504203915.9602-1-akhil.goyal@nxp.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20200504203915.9602-1-akhil.goyal@nxp.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200504203915.9602-1-akhil.goyal@nxp.com", "date": "2020-05-04T20:39:14", "name": "[1/2] crypto/dpaa2_sec: improve error handling", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "3812ec5791d6585a02e23921d3bd4be64da5e615", "submitter": { "id": 517, "url": "http://patches.dpdk.org/api/people/517/?format=api", "name": "Akhil Goyal", "email": "akhil.goyal@nxp.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200504203915.9602-1-akhil.goyal@nxp.com/mbox/", "series": [ { "id": 9816, "url": "http://patches.dpdk.org/api/series/9816/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=9816", "date": "2020-05-04T20:39:14", "name": "[1/2] crypto/dpaa2_sec: improve error handling", "version": 1, "mbox": "http://patches.dpdk.org/series/9816/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/69720/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/69720/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 944C0A04AE;\n\tMon, 4 May 2020 23:00:12 +0200 (CEST)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id EEC9C1D53B;\n\tMon, 4 May 2020 23:00:11 +0200 (CEST)", "from inva021.nxp.com (inva021.nxp.com [92.121.34.21])\n by dpdk.org (Postfix) with ESMTP id 597261D52C\n for <dev@dpdk.org>; Mon, 4 May 2020 23:00:10 +0200 (CEST)", "from inva021.nxp.com (localhost [127.0.0.1])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id D87B8200547;\n Mon, 4 May 2020 23:00:09 +0200 (CEST)", "from invc005.ap-rdc01.nxp.com (invc005.ap-rdc01.nxp.com\n [165.114.16.14])\n by inva021.eu-rdc02.nxp.com (Postfix) with ESMTP id 0AB51200542;\n Mon, 4 May 2020 23:00:08 +0200 (CEST)", "from GDB1.ap.freescale.net (gdb1.ap.freescale.net [10.232.132.179])\n by invc005.ap-rdc01.nxp.com (Postfix) with ESMTP id DEA7E40310;\n Tue, 5 May 2020 05:00:05 +0800 (SGT)" ], "From": "Akhil Goyal <akhil.goyal@nxp.com>", "To": "dev@dpdk.org", "Cc": "hemant.agrawal@nxp.com,\n\tAkhil Goyal <akhil.goyal@nxp.com>", "Date": "Tue, 5 May 2020 02:09:14 +0530", "Message-Id": "<20200504203915.9602-1-akhil.goyal@nxp.com>", "X-Mailer": "git-send-email 2.17.1", "X-Virus-Scanned": "ClamAV using ClamSMTP", "Subject": "[dpdk-dev] [PATCH 1/2] crypto/dpaa2_sec: improve error handling", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The return values in cases of errors were not\nspecified properly. With this patch appropriate\nerror numbers are returned.\n\nSigned-off-by: Akhil Goyal <akhil.goyal@nxp.com>\n---\n drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 59 +++++++++++++--------\n 1 file changed, 38 insertions(+), 21 deletions(-)", "diff": "diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\nindex 0919f3bf4..984c563e3 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n@@ -1814,7 +1814,7 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev,\n {\n \tstruct dpaa2_sec_dev_private *dev_priv = dev->data->dev_private;\n \tstruct alginfo cipherdata;\n-\tint bufsize;\n+\tint bufsize, ret = 0;\n \tstruct ctxt_priv *priv;\n \tstruct sec_flow_context *flc;\n \n@@ -1826,7 +1826,7 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev,\n \t\t\tRTE_CACHE_LINE_SIZE);\n \tif (priv == NULL) {\n \t\tDPAA2_SEC_ERR(\"No Memory for priv CTXT\");\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \n \tpriv->fle_pool = dev_priv->fle_pool;\n@@ -1839,7 +1839,7 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev,\n \tif (session->cipher_key.data == NULL) {\n \t\tDPAA2_SEC_ERR(\"No Memory for cipher key\");\n \t\trte_free(priv);\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tsession->cipher_key.length = xform->cipher.key.length;\n \n@@ -1916,15 +1916,18 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev,\n \tcase RTE_CRYPTO_CIPHER_NULL:\n \t\tDPAA2_SEC_ERR(\"Crypto: Unsupported Cipher alg %u\",\n \t\t\txform->cipher.algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \tdefault:\n \t\tDPAA2_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n \t\t\txform->cipher.algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \t}\n \n \tif (bufsize < 0) {\n \t\tDPAA2_SEC_ERR(\"Crypto: Descriptor build failed\");\n+\t\tret = -EINVAL;\n \t\tgoto error_out;\n \t}\n \n@@ -1936,12 +1939,12 @@ dpaa2_sec_cipher_init(struct rte_cryptodev *dev,\n \tfor (i = 0; i < bufsize; i++)\n \t\tDPAA2_SEC_DEBUG(\"DESC[%d]:0x%x\", i, priv->flc_desc[0].desc[i]);\n #endif\n-\treturn 0;\n+\treturn ret;\n \n error_out:\n \trte_free(session->cipher_key.data);\n \trte_free(priv);\n-\treturn -1;\n+\treturn ret;\n }\n \n static int\n@@ -1951,7 +1954,7 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev,\n {\n \tstruct dpaa2_sec_dev_private *dev_priv = dev->data->dev_private;\n \tstruct alginfo authdata;\n-\tint bufsize;\n+\tint bufsize, ret = 0;\n \tstruct ctxt_priv *priv;\n \tstruct sec_flow_context *flc;\n \n@@ -1964,7 +1967,7 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev,\n \t\t\tRTE_CACHE_LINE_SIZE);\n \tif (priv == NULL) {\n \t\tDPAA2_SEC_ERR(\"No Memory for priv CTXT\");\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \n \tpriv->fle_pool = dev_priv->fle_pool;\n@@ -1976,7 +1979,7 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev,\n \tif (session->auth_key.data == NULL) {\n \t\tDPAA2_SEC_ERR(\"Unable to allocate memory for auth key\");\n \t\trte_free(priv);\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tsession->auth_key.length = xform->auth.key.length;\n \n@@ -2082,15 +2085,18 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev,\n \tcase RTE_CRYPTO_AUTH_AES_CBC_MAC:\n \t\tDPAA2_SEC_ERR(\"Crypto: Unsupported auth alg %un\",\n \t\t\t xform->auth.algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \tdefault:\n \t\tDPAA2_SEC_ERR(\"Crypto: Undefined Auth specified %u\",\n \t\t\t xform->auth.algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \t}\n \n \tif (bufsize < 0) {\n \t\tDPAA2_SEC_ERR(\"Crypto: Invalid buffer length\");\n+\t\tret = -EINVAL;\n \t\tgoto error_out;\n \t}\n \n@@ -2103,12 +2109,12 @@ dpaa2_sec_auth_init(struct rte_cryptodev *dev,\n \t\t\t\ti, priv->flc_desc[DESC_INITFINAL].desc[i]);\n #endif\n \n-\treturn 0;\n+\treturn ret;\n \n error_out:\n \trte_free(session->auth_key.data);\n \trte_free(priv);\n-\treturn -1;\n+\treturn ret;\n }\n \n static int\n@@ -2123,7 +2129,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \tstruct ctxt_priv *priv;\n \tstruct sec_flow_context *flc;\n \tstruct rte_crypto_aead_xform *aead_xform = &xform->aead;\n-\tint err;\n+\tint err, ret = 0;\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -2138,7 +2144,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \t\t\tRTE_CACHE_LINE_SIZE);\n \tif (priv == NULL) {\n \t\tDPAA2_SEC_ERR(\"No Memory for priv CTXT\");\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \n \tpriv->fle_pool = dev_priv->fle_pool;\n@@ -2149,7 +2155,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \tif (session->aead_key.data == NULL && aead_xform->key.length > 0) {\n \t\tDPAA2_SEC_ERR(\"No Memory for aead key\");\n \t\trte_free(priv);\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tmemcpy(session->aead_key.data, aead_xform->key.data,\n \t aead_xform->key.length);\n@@ -2172,10 +2178,12 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \tcase RTE_CRYPTO_AEAD_AES_CCM:\n \t\tDPAA2_SEC_ERR(\"Crypto: Unsupported AEAD alg %u\",\n \t\t\t aead_xform->algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \tdefault:\n \t\tDPAA2_SEC_ERR(\"Crypto: Undefined AEAD specified %u\",\n \t\t\t aead_xform->algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \t}\n \tsession->dir = (aead_xform->op == RTE_CRYPTO_AEAD_OP_ENCRYPT) ?\n@@ -2189,6 +2197,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \n \tif (err < 0) {\n \t\tDPAA2_SEC_ERR(\"Crypto: Incorrect key lengths\");\n+\t\tret = -EINVAL;\n \t\tgoto error_out;\n \t}\n \tif (priv->flc_desc[0].desc[1] & 1) {\n@@ -2212,6 +2221,7 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \t\t\t\tsession->digest_length);\n \tif (bufsize < 0) {\n \t\tDPAA2_SEC_ERR(\"Crypto: Invalid buffer length\");\n+\t\tret = -EINVAL;\n \t\tgoto error_out;\n \t}\n \n@@ -2223,12 +2233,12 @@ dpaa2_sec_aead_init(struct rte_cryptodev *dev,\n \t\tDPAA2_SEC_DEBUG(\"DESC[%d]:0x%x\\n\",\n \t\t\t i, priv->flc_desc[0].desc[i]);\n #endif\n-\treturn 0;\n+\treturn ret;\n \n error_out:\n \trte_free(session->aead_key.data);\n \trte_free(priv);\n-\treturn -1;\n+\treturn ret;\n }\n \n \n@@ -2244,7 +2254,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \tstruct sec_flow_context *flc;\n \tstruct rte_crypto_cipher_xform *cipher_xform;\n \tstruct rte_crypto_auth_xform *auth_xform;\n-\tint err;\n+\tint err, ret = 0;\n \n \tPMD_INIT_FUNC_TRACE();\n \n@@ -2272,7 +2282,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \t\t\tRTE_CACHE_LINE_SIZE);\n \tif (priv == NULL) {\n \t\tDPAA2_SEC_ERR(\"No Memory for priv CTXT\");\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \n \tpriv->fle_pool = dev_priv->fle_pool;\n@@ -2283,7 +2293,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \tif (session->cipher_key.data == NULL && cipher_xform->key.length > 0) {\n \t\tDPAA2_SEC_ERR(\"No Memory for cipher key\");\n \t\trte_free(priv);\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tsession->cipher_key.length = cipher_xform->key.length;\n \tsession->auth_key.data = rte_zmalloc(NULL, auth_xform->key.length,\n@@ -2292,7 +2302,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \t\tDPAA2_SEC_ERR(\"No Memory for auth key\");\n \t\trte_free(session->cipher_key.data);\n \t\trte_free(priv);\n-\t\treturn -1;\n+\t\treturn -ENOMEM;\n \t}\n \tsession->auth_key.length = auth_xform->key.length;\n \tmemcpy(session->cipher_key.data, cipher_xform->key.data,\n@@ -2354,10 +2364,12 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \tcase RTE_CRYPTO_AUTH_ZUC_EIA3:\n \t\tDPAA2_SEC_ERR(\"Crypto: Unsupported auth alg %u\",\n \t\t\t auth_xform->algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \tdefault:\n \t\tDPAA2_SEC_ERR(\"Crypto: Undefined Auth specified %u\",\n \t\t\t auth_xform->algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \t}\n \tcipherdata.key = (size_t)session->cipher_key.data;\n@@ -2389,10 +2401,12 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \tcase RTE_CRYPTO_CIPHER_KASUMI_F8:\n \t\tDPAA2_SEC_ERR(\"Crypto: Unsupported Cipher alg %u\",\n \t\t\t cipher_xform->algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \tdefault:\n \t\tDPAA2_SEC_ERR(\"Crypto: Undefined Cipher specified %u\",\n \t\t\t cipher_xform->algo);\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \t}\n \tsession->dir = (cipher_xform->op == RTE_CRYPTO_CIPHER_OP_ENCRYPT) ?\n@@ -2407,6 +2421,7 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \n \tif (err < 0) {\n \t\tDPAA2_SEC_ERR(\"Crypto: Incorrect key lengths\");\n+\t\tret = -EINVAL;\n \t\tgoto error_out;\n \t}\n \tif (priv->flc_desc[0].desc[2] & 1) {\n@@ -2434,10 +2449,12 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \t\t\t\t\t session->dir);\n \t\tif (bufsize < 0) {\n \t\t\tDPAA2_SEC_ERR(\"Crypto: Invalid buffer length\");\n+\t\t\tret = -EINVAL;\n \t\t\tgoto error_out;\n \t\t}\n \t} else {\n \t\tDPAA2_SEC_ERR(\"Hash before cipher not supported\");\n+\t\tret = -ENOTSUP;\n \t\tgoto error_out;\n \t}\n \n@@ -2450,13 +2467,13 @@ dpaa2_sec_aead_chain_init(struct rte_cryptodev *dev,\n \t\t\t i, priv->flc_desc[0].desc[i]);\n #endif\n \n-\treturn 0;\n+\treturn ret;\n \n error_out:\n \trte_free(session->cipher_key.data);\n \trte_free(session->auth_key.data);\n \trte_free(priv);\n-\treturn -1;\n+\treturn ret;\n }\n \n static int\n", "prefixes": [ "1/2" ] }{ "id": 69720, "url": "