Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 8 Apr 2012 04:09:55 +0000 (UTC)
From:      Konstantin Belousov <kib@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject:   svn commit: r234012 - stable/9/libexec/rtld-elf
Message-ID:  <201204080409.q3849tBm092205@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kib
Date: Sun Apr  8 04:09:55 2012
New Revision: 234012
URL: http://svn.freebsd.org/changeset/base/234012

Log:
  MFC r233927:
  Properly handle absent AT_CANARY aux entry.

Modified:
  stable/9/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/9/libexec/rtld-elf/   (props changed)

Modified: stable/9/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/9/libexec/rtld-elf/rtld.c	Sun Apr  8 03:55:25 2012	(r234011)
+++ stable/9/libexec/rtld-elf/rtld.c	Sun Apr  8 04:09:55 2012	(r234012)
@@ -351,7 +351,8 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_
     main_argc = argc;
     main_argv = argv;
 
-    if (aux_info[AT_CANARY]->a_un.a_ptr != NULL) {
+    if (aux_info[AT_CANARY] != NULL &&
+	aux_info[AT_CANARY]->a_un.a_ptr != NULL) {
 	    i = aux_info[AT_CANARYLEN]->a_un.a_val;
 	    if (i > sizeof(__stack_chk_guard))
 		    i = sizeof(__stack_chk_guard);



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201204080409.q3849tBm092205>