diff --git a/0040-fix-double-free.patch b/0040-fix-double-free.patch new file mode 100644 index 0000000000000000000000000000000000000000..807856443f68a94027cde57ba747aeb69a74c954 --- /dev/null +++ b/0040-fix-double-free.patch @@ -0,0 +1,36 @@ +From 297bce40545793d545747e25f614b09a185ef489 Mon Sep 17 00:00:00 2001 +From: houmingyong +Date: Wed, 23 Feb 2022 20:33:32 +0800 +Subject: [PATCH] fix double free + +--- + src/host_src/gp/gp_enclave.c | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +diff --git a/src/host_src/gp/gp_enclave.c b/src/host_src/gp/gp_enclave.c +index c7554de..9bc9514 100644 +--- a/src/host_src/gp/gp_enclave.c ++++ b/src/host_src/gp/gp_enclave.c +@@ -255,10 +255,15 @@ static bool handle_ocall(uint32_t agent_id, int dev_fd, void *buffer, cc_ocall_f + } + ret = true; + done: +- free(tmp_input_buffer); +- free(tmp_output_buffer); +- tmp_input_buffer = NULL; +- tmp_output_buffer = NULL; ++ if (tmp_input_buffer != NULL) { ++ free(tmp_input_buffer); ++ tmp_input_buffer = NULL; ++ } ++ if (tmp_output_buffer != NULL) { ++ free(tmp_output_buffer); ++ tmp_output_buffer = NULL; ++ } ++ + return ret; + } + +-- +2.27.0 + diff --git a/secGear.spec b/secGear.spec index 800fc410c94a9075f479acfe7b6de2f149e209b2..88f5e7533cf65ac0d4f0c13203c39e422a362645 100644 --- a/secGear.spec +++ b/secGear.spec @@ -1,6 +1,6 @@ Name: secGear Version: 0.1.0 -Release: 21%{?dist} +Release: 22%{?dist} Summary: secGear is an SDK to develop confidential computing apps based on hardware enclave features @@ -48,6 +48,7 @@ Patch35: 0036-enclave-use-the-can-pull-image-from-hub.oepkgs.net.patch Patch36: 0037-add-description-about-file-parameter-path-for-sign_t.patch Patch37: 0038-fix-use-after-free-in-cc_enclave_create.patch Patch38: 0039-clean-memory-when-it-come-to-error_handle.patch +Patch39: 0040-fix-double-free.patch BuildRequires: gcc python automake autoconf libtool BUildRequires: glibc glibc-devel cmake ocaml-dune rpm gcc-c++ @@ -163,6 +164,9 @@ popd systemctl restart rsyslog %changelog +* Wed Feb 23 2022 houmingyong - 0.1.0-22 +- DESC: fix double free bug + * Tue Jan 11 2022 houmingyong - 0.1.0-21 - DESC: fix no secgear.log after install secGear-devel