[glibc/maskray/grte] Fix out-of-date bits in EXEC_ORIGIN patch

[glibc/maskray/grte] Fix out-of-date bits in EXEC_ORIGIN patch

[Fangrui Song]

https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d5adfa3af5d47567826b102babe976087315159c

commit d5adfa3af5d47567826b102babe976087315159c
Author: Stan Shebs <stanshebs@google.com>
Date:   Mon Mar 19 09:41:11 2018 -0700

    Fix out-of-date bits in EXEC_ORIGIN patch

Diff:
---
 elf/dl-load.c | 4 ++--
 elf/rtld.c    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/elf/dl-load.c b/elf/dl-load.c
index 50cbed2d22..4d8af1db41 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -275,9 +275,9 @@ _dl_dst_substitute (struct link_map *l, const char *name, char *result)
 	    repl = GLRO(dl_platform);
 	  else if ((len = is_dst (start, name, "LIB", 0)) != 0)
 	    repl = DL_DST_LIB;
-	  else if ((len = is_dst (start, name, "EXEC_ORIGIN", is_path, 0)) != 0)
+	  else if ((len = is_dst (start, name, "EXEC_ORIGIN", 0)) != 0)
 	    {
-	      if (INTUSE(__libc_enable_secure) != 0)
+	      if (__libc_enable_secure)
 		_dl_fatal_printf ("$EXEC_ORIGIN rpath entry not allowed in setuid/setgid executables.\n");
 
 	      repl = GLRO(google_exec_origin_dir);
diff --git a/elf/rtld.c b/elf/rtld.c
index 79351e53ed..90f7eebdcf 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -1041,7 +1041,7 @@ of this helper program; chances are you did not intend to run this program.\n\
 			in LIST\n\
   --audit LIST          use objects named in LIST as auditors\n");
 
-      set_exec_origin_dir (INTUSE(_dl_argv)[1]);
+      set_exec_origin_dir (_dl_argv[1]);
 
       ++_dl_skip_args;
       --_dl_argc;