Attachment 1484954 Details for Bug 1618375 – patch to free the tls_last_status memory

[patch] patch to free the tls_last_status memory

gssproxy-free_tls_last_status.patch (text/plain), 1.95 KB, created by Frank Sorenson on 2018-09-19 22:39:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Sorenson

Created: 2018-09-19 22:39:10 UTC

Size: 1.95 KB

patch

obsolete

>commit a1f03e255b6e1408b3845493ca3303695954100d
>Author: Frank Sorenson <sorenson@redhat.com>
>Date:   2018-09-19 17:24:28 -0500
>
>    Don't leak the memory allocated per-thread for tls_last_status
>    
>    Although the tls_last_status variable itself is thread-specific,
>    the data it points to is allocated on the heap, and is not
>    released when the thread exits.
>    
>    Signed-off-by: Frank Sorenson <sorenson@redhat.com>
>
>diff --git a/src/client/gpm_display_status.c b/src/client/gpm_display_status.c
>index bbb546f..e4f0baf 100644
>--- a/src/client/gpm_display_status.c
>+++ b/src/client/gpm_display_status.c
>@@ -6,14 +6,20 @@ __thread gssx_status *tls_last_status = NULL;
> 
> /* Thread local storage for return status.
>  * FIXME: it's not the most portable construct, so may need fixing in future */
>-void gpm_save_status(gssx_status *status)
>+void gpm_free_tls_last_status(void)
> {
>-    int ret;
>-
>     if (tls_last_status) {
>         xdr_free((xdrproc_t)xdr_gssx_status, (char *)tls_last_status);
>         free(tls_last_status);
>+        tls_last_status = NULL;
>     }
>+}
>+
>+void gpm_save_status(gssx_status *status)
>+{
>+    int ret;
>+
>+    gpm_free_tls_last_status();
> 
>     ret = gp_copy_gssx_status_alloc(status, &tls_last_status);
>     if (ret) {
>@@ -64,6 +70,7 @@ OM_uint32 gpm_display_status(OM_uint32 *minor_status,
>                 status_string->value = tmp.utf8string_val;
>                 status_string->length = tmp.utf8string_len;
>                 *minor_status = 0;
>+                gpm_free_tls_last_status();
>                 return GSS_S_COMPLETE;
>         } else {
>             /* if we do not have it, make it clear */
>@@ -88,6 +95,7 @@ OM_uint32 gpm_display_status(OM_uint32 *minor_status,
>             }
>             status_string->value = tmp.utf8string_val;
>             status_string->length = tmp.utf8string_len;
>+            gpm_free_tls_last_status();
>         } else {
>             /* if we do not have it, make it clear */
>             return GSS_S_UNAVAILABLE;

Actions: View | Diff

Attachments on bug 1618375: 1484480 | 1484954