From: Quentin Lambert <lambert.quentin@gmail.com>
To: Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
Salvatore Benedetto <salvatore.benedetto@intel.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
qat-linux@intel.com, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org,
Quentin Lambert <lambert.quentin@gmail.com>
Subject: [PATCH v2 1/2] crypto: qat - introduces a variable to handle error codes
Date: Fri, 02 Sep 2016 14:47:52 +0000 [thread overview]
Message-ID: <20160902144753.31334-2-lambert.quentin@gmail.com> (raw)
In-Reply-To: <20160902144753.31334-1-lambert.quentin@gmail.com>
Most error code used to jump to a label that lead to a "return -EFAULT"
statement. This patch introduces a variable that stores the error code
so that other error branches can use the same label to exit.
Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
---
drivers/crypto/qat/qat_common/qat_uclo.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -966,6 +966,7 @@ static int qat_uclo_parse_uof_obj(struct
{
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
unsigned int ae;
+ int ret;
obj_handle->uword_buf = kcalloc(UWORD_CPYBUF_SIZE, sizeof(uint64_t),
GFP_KERNEL);
@@ -987,29 +988,35 @@ static int qat_uclo_parse_uof_obj(struct
!qat_uclo_map_str_table(obj_handle->obj_hdr, ICP_QAT_UOF_STRT,
&obj_handle->str_table)) {
pr_err("QAT: UOF doesn't have effective images\n");
+ ret = -EFAULT;
goto out_err;
}
obj_handle->uimage_num qat_uclo_map_uimage(obj_handle, obj_handle->ae_uimage,
ICP_QAT_UCLO_MAX_AE * ICP_QAT_UCLO_MAX_CTX);
- if (!obj_handle->uimage_num)
+ if (!obj_handle->uimage_num) {
+ ret = -EFAULT;
goto out_err;
+ }
if (qat_uclo_map_ae(handle, handle->hal_handle->ae_max_num)) {
pr_err("QAT: Bad object\n");
+ ret = -EFAULT;
goto out_check_uof_aemask_err;
}
qat_uclo_init_uword_num(handle);
qat_uclo_map_initmem_table(&obj_handle->encap_uof_obj,
&obj_handle->init_mem_tab);
- if (qat_uclo_set_ae_mode(handle))
+ if (qat_uclo_set_ae_mode(handle)) {
+ ret = -EFAULT;
goto out_check_uof_aemask_err;
+ }
return 0;
out_check_uof_aemask_err:
for (ae = 0; ae < obj_handle->uimage_num; ae++)
kfree(obj_handle->ae_uimage[ae].page);
out_err:
kfree(obj_handle->uword_buf);
- return -EFAULT;
+ return ret;
}
static int qat_uclo_map_suof_file_hdr(struct icp_qat_fw_loader_handle *handle,
WARNING: multiple messages have this Message-ID (diff)
From: Quentin Lambert <lambert.quentin@gmail.com>
To: Giovanni Cabiddu <giovanni.cabiddu@intel.com>,
Salvatore Benedetto <salvatore.benedetto@intel.com>,
Herbert Xu <herbert@gondor.apana.org.au>,
"David S. Miller" <davem@davemloft.net>,
qat-linux@intel.com, linux-crypto@vger.kernel.org,
linux-kernel@vger.kernel.org
Cc: kernel-janitors@vger.kernel.org,
Quentin Lambert <lambert.quentin@gmail.com>
Subject: [PATCH v2 1/2] crypto: qat - introduces a variable to handle error codes
Date: Fri, 2 Sep 2016 16:47:52 +0200 [thread overview]
Message-ID: <20160902144753.31334-2-lambert.quentin@gmail.com> (raw)
In-Reply-To: <20160902144753.31334-1-lambert.quentin@gmail.com>
Most error code used to jump to a label that lead to a "return -EFAULT"
statement. This patch introduces a variable that stores the error code
so that other error branches can use the same label to exit.
Signed-off-by: Quentin Lambert <lambert.quentin@gmail.com>
---
drivers/crypto/qat/qat_common/qat_uclo.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
--- a/drivers/crypto/qat/qat_common/qat_uclo.c
+++ b/drivers/crypto/qat/qat_common/qat_uclo.c
@@ -966,6 +966,7 @@ static int qat_uclo_parse_uof_obj(struct
{
struct icp_qat_uclo_objhandle *obj_handle = handle->obj_handle;
unsigned int ae;
+ int ret;
obj_handle->uword_buf = kcalloc(UWORD_CPYBUF_SIZE, sizeof(uint64_t),
GFP_KERNEL);
@@ -987,29 +988,35 @@ static int qat_uclo_parse_uof_obj(struct
!qat_uclo_map_str_table(obj_handle->obj_hdr, ICP_QAT_UOF_STRT,
&obj_handle->str_table)) {
pr_err("QAT: UOF doesn't have effective images\n");
+ ret = -EFAULT;
goto out_err;
}
obj_handle->uimage_num =
qat_uclo_map_uimage(obj_handle, obj_handle->ae_uimage,
ICP_QAT_UCLO_MAX_AE * ICP_QAT_UCLO_MAX_CTX);
- if (!obj_handle->uimage_num)
+ if (!obj_handle->uimage_num) {
+ ret = -EFAULT;
goto out_err;
+ }
if (qat_uclo_map_ae(handle, handle->hal_handle->ae_max_num)) {
pr_err("QAT: Bad object\n");
+ ret = -EFAULT;
goto out_check_uof_aemask_err;
}
qat_uclo_init_uword_num(handle);
qat_uclo_map_initmem_table(&obj_handle->encap_uof_obj,
&obj_handle->init_mem_tab);
- if (qat_uclo_set_ae_mode(handle))
+ if (qat_uclo_set_ae_mode(handle)) {
+ ret = -EFAULT;
goto out_check_uof_aemask_err;
+ }
return 0;
out_check_uof_aemask_err:
for (ae = 0; ae < obj_handle->uimage_num; ae++)
kfree(obj_handle->ae_uimage[ae].page);
out_err:
kfree(obj_handle->uword_buf);
- return -EFAULT;
+ return ret;
}
static int qat_uclo_map_suof_file_hdr(struct icp_qat_fw_loader_handle *handle,
next prev parent reply other threads:[~2016-09-02 14:47 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 14:37 [PATCH 0/2] add omitted release in qat_common Quentin Lambert
2016-09-02 14:37 ` Quentin Lambert
2016-09-02 14:37 ` [PATCH 1/2] crypto: qat - introduces a variable to handle error codes Quentin Lambert
2016-09-02 14:37 ` Quentin Lambert
2016-09-02 14:37 ` [PATCH 2/2] crypto: qat - fix resource release omissions Quentin Lambert
2016-09-02 14:37 ` Quentin Lambert
2016-09-02 14:43 ` [PATCH 0/2][RESEND] add omitted release in qat_common Quentin Lambert
2016-09-02 14:43 ` Quentin Lambert
2016-09-02 14:43 ` [PATCH 1/2][RESEND] crypto: qat - introduces a variable to handle error codes Quentin Lambert
2016-09-02 14:43 ` Quentin Lambert
2016-09-02 14:43 ` [PATCH 2/2] crypto: qat - fix resource release omissions Quentin Lambert
2016-09-02 14:43 ` Quentin Lambert
2016-09-02 14:47 ` [PATCH v2 0/2] add omitted release in qat_common Quentin Lambert
2016-09-02 14:47 ` Quentin Lambert
2016-09-02 14:47 ` Quentin Lambert [this message]
2016-09-02 14:47 ` [PATCH v2 1/2] crypto: qat - introduces a variable to handle error codes Quentin Lambert
2016-09-02 14:47 ` [PATCH v2 2/2] crypto: qat - fix resource release omissions Quentin Lambert
2016-09-02 14:47 ` Quentin Lambert
2016-09-06 10:18 ` Giovanni Cabiddu
2016-09-06 10:18 ` Giovanni Cabiddu
2016-09-13 12:40 ` Herbert Xu
2016-09-13 12:40 ` Herbert Xu
2016-09-13 12:56 ` Quentin Lambert
2016-09-13 12:56 ` Quentin Lambert
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160902144753.31334-2-lambert.quentin@gmail.com \
--to=lambert.quentin@gmail.com \
--cc=davem@davemloft.net \
--cc=giovanni.cabiddu@intel.com \
--cc=herbert@gondor.apana.org.au \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=qat-linux@intel.com \
--cc=salvatore.benedetto@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.