Libc-1353.100.2.tar.gz

[apple/libc.git] / secure / chk_fail.c

diff --git a/secure/chk_fail.c b/secure/chk_fail.c
index db859a6e6bdc9b5463ba36fc6a9c86b29602ea17..9dc6c002f0a82a6929ad307bc81a01f530724e23 100644 (file)
--- a/secure/chk_fail.c
+++ b/secure/chk_fail.c
@@ -21,17 +21,16 @@
  * @APPLE_LICENSE_HEADER_END@
  */
 
  * @APPLE_LICENSE_HEADER_END@
  */
 

-#include <syslog.h>
-#include <sys/sysctl.h>
-#include <sys/param.h>
-#include <unistd.h>
-#include <stdlib.h>
+#include <os/assumes.h>
+#include <stdint.h>

 #include <TargetConditionals.h>
 #include <TargetConditionals.h>

+#include "crt_externs.h"

 
 

+#ifndef PR_13085474_CHECK
+#define PR_13085474_CHECK TARGET_OS_OSX
+#endif

 
 

-#if !defined(PR_13085474_CHECK)
-#define PR_13085474_CHECK 1
-
+#if PR_13085474_CHECK

 /* Some shipped applications fail this check and were tested against
  * versions of these functions that supported overlapping buffers.
  *
 /* Some shipped applications fail this check and were tested against
  * versions of these functions that supported overlapping buffers.
  *


@@ -43,82 +42,55 @@
 #include <libkern/OSAtomic.h>
 #include <mach-o/dyld.h>
 #include <mach-o/dyld_priv.h>
 #include <libkern/OSAtomic.h>
 #include <mach-o/dyld.h>
 #include <mach-o/dyld_priv.h>

-#define DYLD_OS_VERSION(major, minor, tiny) ((((major) & 0xffff) << 16) | (((minor) & 0xff) << 8) | ((tiny) & 0xff))
-#if TARGET_OS_IPHONE
-#define START_VERSION DYLD_OS_VERSION(7,0,0)
+#if TARGET_OS_OSX
+#define START_VERSION dyld_platform_version_macOS_10_9

 #else
 #else

-#define START_VERSION DYLD_OS_VERSION(10,9,0)
+#error "This platform should not build with PR_13085474_CHECK=1"

 #endif
 #endif /* !PR_13085474_CHECK */
 
 /* For PR_13085474_CHECK set, we initialize __chk_assert_no_overlap to
 #endif
 #endif /* !PR_13085474_CHECK */
 
 /* For PR_13085474_CHECK set, we initialize __chk_assert_no_overlap to

- * a value neither 0 or 1.  We call _dyld_register_func_for_add_image()
- * to register a callback, and use the non-one value of
- * __chk_assert_no_overlap to skip sdk version checks (but we do
- * perform overlap checks).  To detect if the main program was built
- * prior to START_VERSION, we call dyld_get_program_sdk_version(),
- * which we do before setting up the callback (since we don't need it
- * if the main program is older).
- *
- * After _dyld_register_func_for_add_image() returns, we set
- * __chk_assert_no_overlap to 1, which enables the sdk version checking
- * for subsequent loaded shared objects.  If we then find an old version,
- * we set __chk_assert_no_overlap to 0 to turn off overlap checking.
+ * 1 initially and then reset it to 0 if the main image of the process
+ * was linked earlier than 10.9.

  *
  * If PR_13085474_CHECK is zero, then we never do any sdk version checking
  * and always do overlap checks.
  */
 __attribute__ ((visibility ("hidden")))
  *
  * If PR_13085474_CHECK is zero, then we never do any sdk version checking
  * and always do overlap checks.
  */
 __attribute__ ((visibility ("hidden")))

-uint32_t __chk_assert_no_overlap
-#if PR_13085474_CHECK
-                                 = 42;
-#else
-                                 = 1;
-#endif
+uint32_t __chk_assert_no_overlap = 1;

 
 #if PR_13085474_CHECK
 
 #if PR_13085474_CHECK

-static void
-__chk_assert_no_overlap_callback(const struct mach_header *mh, intptr_t vmaddr_slide __unused) {
-  if (__chk_assert_no_overlap != 1) return;
-  if (dyld_get_sdk_version(mh) < START_VERSION) OSAtomicAnd32(0U, &__chk_assert_no_overlap);
+static bool
+__chk_assert_sdk_pre_start(const struct mach_header *mh) {
+  return (dyld_get_active_platform() == PLATFORM_MACOS &&
+      !dyld_sdk_at_least(mh, START_VERSION));

 }
 #endif
 
 __attribute__ ((visibility ("hidden")))
 void __chk_init(void) {
 #if PR_13085474_CHECK
 }
 #endif
 
 __attribute__ ((visibility ("hidden")))
 void __chk_init(void) {
 #if PR_13085474_CHECK

-  if (dyld_get_program_sdk_version() < START_VERSION) {
+  if (__chk_assert_sdk_pre_start((const struct mach_header *)
+        _NSGetMachExecuteHeader())) {

     __chk_assert_no_overlap = 0;
     __chk_assert_no_overlap = 0;

-  } else {
-    _dyld_register_func_for_add_image(__chk_assert_no_overlap_callback);
-    __chk_assert_no_overlap = 1;

   }
 #endif
 }
 
   }
 #endif
 }
 

-__attribute__ ((noreturn))
-static void
-__chk_fail (const char *message)
-{
-  syslog(LOG_CRIT, "%s", message);
-  abort_report_np("%s", message);
-}
-

 __attribute__ ((visibility ("hidden")))
 __attribute__ ((noreturn))
 void
 __chk_fail_overflow (void) {
 __attribute__ ((visibility ("hidden")))
 __attribute__ ((noreturn))
 void
 __chk_fail_overflow (void) {

-  __chk_fail("detected buffer overflow");
+  os_crash("detected buffer overflow");

 }
 
 __attribute__ ((visibility ("hidden")))
 __attribute__ ((noreturn))
 void
 __chk_fail_overlap (void) {
 }
 
 __attribute__ ((visibility ("hidden")))
 __attribute__ ((noreturn))
 void
 __chk_fail_overlap (void) {

-  __chk_fail("detected source and destination buffer overlap");
+  os_crash("detected source and destination buffer overlap");

 }
 
 }
 

-

 __attribute__ ((visibility ("hidden")))
 void
 __chk_overlap (const void *_a, size_t an, const void *_b, size_t bn) {
 __attribute__ ((visibility ("hidden")))
 void
 __chk_overlap (const void *_a, size_t an, const void *_b, size_t bn) {