svn commit: r323877 - in stable: 10/libexec/rtld-elf 11/libexec/rtld-elf

[John Baldwin]

Author: jhb
Date: Thu Sep 21 20:59:36 2017
New Revision: 323877
URL: https://svnweb.freebsd.org/changeset/base/323877

Log:
  MFC 323025: Read max_stack_flags from correct object.
  
  'obj' is not initialized here.
  
  Sponsored by:	DARPA / AFRL

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

Changes in other areas also in this revision:
Modified:
  stable/11/libexec/rtld-elf/rtld.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/10/libexec/rtld-elf/rtld.c
==============================================================================
--- stable/10/libexec/rtld-elf/rtld.c	Thu Sep 21 20:34:33 2017	(r323876)
+++ stable/10/libexec/rtld-elf/rtld.c	Thu Sep 21 20:59:36 2017	(r323877)
@@ -470,7 +470,7 @@ _rtld(Elf_Addr *sp, func_ptr_type *exit_proc, Obj_Entr
 	close(fd);
 	if (obj_main == NULL)
 	    rtld_die();
-	max_stack_flags = obj->stack_flags;
+	max_stack_flags = obj_main->stack_flags;
     } else {				/* Main program already loaded. */
 	const Elf_Phdr *phdr;
 	int phnum;