diff options
| author | Jeremy Cline <jcline@redhat.com> | 2019-12-04 13:38:43 -0500 |
|---|---|---|
| committer | Jeremy Cline <jcline@redhat.com> | 2019-12-04 13:38:43 -0500 |
| commit | 079e0f545a491903a6acb0dc783d162ae84a2e6c (patch) | |
| tree | 7a030bec812ab5e3e50079ebf0015ce8504a5b3e /0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch | |
| parent | c1e2dca7bf02f21854445669ab48f82dead65dfc (diff) | |
| download | kernel-079e0f545a491903a6acb0dc783d162ae84a2e6c.tar.gz kernel-079e0f545a491903a6acb0dc783d162ae84a2e6c.tar.xz kernel-079e0f545a491903a6acb0dc783d162ae84a2e6c.zip | |
Sync up stabilization with f31
Diffstat (limited to '0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch')
| -rw-r--r-- | 0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch | 37 |
1 files changed, 37 insertions, 0 deletions
diff --git a/0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch b/0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch new file mode 100644 index 000000000..fc8bde000 --- /dev/null +++ b/0001-crypto-ccp-Release-all-allocated-memory-if-sha-type-.patch @@ -0,0 +1,37 @@ +From 128c66429247add5128c03dc1e144ca56f05a4e2 Mon Sep 17 00:00:00 2001 +From: Navid Emamdoost <navid.emamdoost@gmail.com> +Date: Thu, 19 Sep 2019 11:04:48 -0500 +Subject: [PATCH] crypto: ccp - Release all allocated memory if sha type is + invalid + +Release all allocated memory if sha type is invalid: +In ccp_run_sha_cmd, if the type of sha is invalid, the allocated +hmac_buf should be released. + +v2: fix the goto. + +Signed-off-by: Navid Emamdoost <navid.emamdoost@gmail.com> +Acked-by: Gary R Hook <gary.hook@amd.com> +Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> +--- + drivers/crypto/ccp/ccp-ops.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/drivers/crypto/ccp/ccp-ops.c b/drivers/crypto/ccp/ccp-ops.c +index c8da8eb160da..422193690fd4 100644 +--- a/drivers/crypto/ccp/ccp-ops.c ++++ b/drivers/crypto/ccp/ccp-ops.c +@@ -1777,8 +1777,9 @@ ccp_run_sha_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd) + LSB_ITEM_SIZE); + break; + default: ++ kfree(hmac_buf); + ret = -EINVAL; +- goto e_ctx; ++ goto e_data; + } + + memset(&hmac_cmd, 0, sizeof(hmac_cmd)); +-- +2.23.0 + |