From 4cd849eea2456dd804d44d813ba32383e194b62d Mon Sep 17 00:00:00 2001 From: Robbie Harwood Date: Mon, 3 Apr 2017 16:09:13 +0000 Subject: [PATCH] Backport fix for double unlock --- ...gpm_release_ctx-to-fix-double-unlock.patch | 37 +++++++++++++++++++ gssproxy.spec | 7 +++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 Remove-gpm_release_ctx-to-fix-double-unlock.patch diff --git a/Remove-gpm_release_ctx-to-fix-double-unlock.patch b/Remove-gpm_release_ctx-to-fix-double-unlock.patch new file mode 100644 index 0000000..85f5445 --- /dev/null +++ b/Remove-gpm_release_ctx-to-fix-double-unlock.patch @@ -0,0 +1,37 @@ +From 74b537ecc4ce7115869658749bed5a9b43ead093 Mon Sep 17 00:00:00 2001 +From: Robbie Harwood +Date: Thu, 23 Mar 2017 13:42:55 -0400 +Subject: [PATCH] Remove gpm_release_ctx() to fix double unlock + +Signed-off-by: Robbie Harwood +Reviewed-by: Simo Sorce +Merges: #173 +(cherry picked from commit b50a863b20649b80cc44c88aa325c6c3220af61b) +--- + proxy/src/client/gpm_common.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/proxy/src/client/gpm_common.c b/proxy/src/client/gpm_common.c +index 0a54dbc..1366463 100644 +--- a/proxy/src/client/gpm_common.c ++++ b/proxy/src/client/gpm_common.c +@@ -312,11 +312,6 @@ static struct gpm_ctx *gpm_get_ctx(void) + return &gpm_global_ctx; + } + +-static void gpm_release_ctx(struct gpm_ctx *gpmctx) +-{ +- gpm_release_sock(gpmctx); +-} +- + OM_uint32 gpm_release_buffer(OM_uint32 *minor_status, + gss_buffer_t buffer) + { +@@ -502,7 +497,6 @@ done: + xdr_free((xdrproc_t)xdr_gp_rpc_msg, (char *)&msg); + xdr_destroy(&xdr_call_ctx); + xdr_destroy(&xdr_reply_ctx); +- gpm_release_ctx(gpmctx); + return ret; + } + diff --git a/gssproxy.spec b/gssproxy.spec index a3a2bc6..eb384eb 100644 --- a/gssproxy.spec +++ b/gssproxy.spec @@ -1,6 +1,6 @@ Name: gssproxy Version: 0.7.0 -Release: 3%{?dist} +Release: 4%{?dist} Summary: GSSAPI Proxy Group: System Environment/Libraries @@ -17,6 +17,7 @@ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Patch0: Properly-renew-expired-credentials.patch Patch1: Change-impersonator-check-code.patch Patch2: Allow-connection-to-self-when-impersonator-set.patch +Patch3: Remove-gpm_release_ctx-to-fix-double-unlock.patch ### Dependencies ### Requires: krb5-libs >= 1.12.0 @@ -55,6 +56,7 @@ A proxy for GSSAPI credential handling %patch0 -p2 -b .Properly-renew-expired-credentials %patch1 -p2 -b .Change-impersonator-check-code %patch2 -p2 -b .Allow-connection-to-self-when-impersonator-set +%patch3 -p2 -b .Remove-gpm_release_ctx-to-fix-double-unlock @@ -112,6 +114,9 @@ rm -rf %{buildroot} %systemd_postun_with_restart gssproxy.service %changelog +* Mon Apr 03 2017 Robbie Harwood - 0.7.0-4 +- Backport fix for double unlock + * Tue Mar 28 2017 Robbie Harwood - 0.7.0-3 - Drop NFS server snippet (removes dependency on nfs kernel component)