Attachment 17634 Details for Bug 15228 – proposed fix (for nss_wrapper)

[patch] proposed fix (for nss_wrapper)

patch-nss_wrapper.patch (text/plain), 1.00 KB, created by Samuel Thibault on 2022-11-08 00:49:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Thibault

Created: 2022-11-08 00:49:41 UTC

Size: 1.00 KB

patch

obsolete

>nwrap: Avoid dclose(RTLD_NEXT)
>
>In case the libc was not found and RTLD_NEXT is used instead, we should not
>dlclose it, otherwise mayhem happens.
>
>Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
>
>diff --git a/src/nss_wrapper.c b/src/nss_wrapper.c
>index 07c9757..b95afdf 100644
>--- a/src/nss_wrapper.c
>+++ b/src/nss_wrapper.c
>@@ -6499,13 +6499,25 @@ void nwrap_destructor(void)
> 
> 		/* libc */
> 		if (m->libc != NULL) {
>-			if (m->libc->handle != NULL) {
>+			if (m->libc->handle != NULL
>+#ifdef RTLD_NEXT
>+				&& m->libc->handle != RTLD_NEXT
>+#endif
>+					) {
> 				dlclose(m->libc->handle);
> 			}
>-			if (m->libc->nsl_handle != NULL) {
>+			if (m->libc->nsl_handle != NULL
>+#ifdef RTLD_NEXT
>+				&& m->libc->nsl_handle != RTLD_NEXT
>+#endif
>+					) {
> 				dlclose(m->libc->nsl_handle);
> 			}
>-			if (m->libc->sock_handle != NULL) {
>+			if (m->libc->sock_handle != NULL
>+#ifdef RTLD_NEXT
>+				&& m->libc->sock_handle != RTLD_NEXT
>+#endif
>+					) {
> 				dlclose(m->libc->sock_handle);
> 			}
> 			SAFE_FREE(m->libc);

Actions: View

Attachments on bug 15228: 17632 | 17633 | 17634 | 17635 | 17636