6678310 using LD_AUDIT, ld.so.1 calls shared library's .init before library is fully relocated

6689238 libc needs global protection against ld.so.1

1 files changed, 16 insertions, 6 deletions

diff --git a/usr/src/lib/libc/inc/libc_int.h b/usr/src/lib/libc/inc/libc_int.h
index c427a56152..3cb5be036d 100644
--- a/usr/src/lib/libc/inc/libc_int.h
+++ b/usr/src/lib/libc/inc/libc_int.h
@@ -2,9 +2,8 @@
  * CDDL HEADER START
  *
  * The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License").  You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
  *
  * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
  * or http://www.opensolaris.org/os/licensing.
@@ -19,8 +18,9 @@
  *
  * CDDL HEADER END
  */
+
 /*
- * Copyright 1999-2003 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -55,8 +55,18 @@ extern "C" {
 #define	CI_V_TWO	2
 #define	CI_V_THREE	3
 #define	CI_V_FOUR	4
-#define	CI_V_CURRENT	CI_V_FOUR	/* current version of libc interface */
-#define	CI_V_NUM	5		/* number of CI_V_* numbers */
+#define	CI_V_FIVE	5
+#define	CI_V_CURRENT	CI_V_FIVE	/* current version of libc interface */
+#define	CI_V_NUM	6		/* number of CI_V_* numbers */
+
+/*
+ * Flags for the bindguard routines.
+ * THR_FLG_RTLD used to live in usr/src/cmd/sgs/rtld/common/_rtld.h
+ * THR_FLG_NOLOCK and THR_FLG_REENTER are new in version CI_V_FIVE.
+ */
+#define	THR_FLG_RTLD	0x00000001	/* bind_guard() flag */
+#define	THR_FLG_NOLOCK	0x00000002	/* don't use ld.so.1's lock */
+#define	THR_FLG_REENTER	0x00000004	/* temporary leave / reenter */
 
 /*
  * Libc to ld.so.1 interface communication structure.