Enable check for DEP / NX page protection

src/trusted/sel_universal/sel_universal.c

 /*
  * Copyright 2008 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 /*
  * NaCl testing shell
  */
 
@@ skipping 43 matching lines @@
   static char*               application_name = NULL;
   int                        i;
   size_t                     n;
   int                        sel_ldr_argc;
   char**                     tmp_ldr_argv;
   const char**               sel_ldr_argv;
   int                        module_argc;
   const char**               module_argv;
   static const char*         kFixedArgs[] = { "-X", "5" };
   int                        pass_debug = 0;
-
+  int                        pass_pq_disable = 0;
 
   /* Descriptor transfer requires the following. */
   NaClNrdAllModulesInit();
 
   /* command line parsing */
   while ((opt = getopt(argc, argv, "df:Qv")) != -1) {
     switch (opt) {
       case 'd':
         pass_debug = 1;
         break;
       case 'f':
         application_name = optarg;
         break;
       case 'v':
         NaClLogIncrVerbosity();
         break;
       case 'Q':
-        /* TODO(cbiffle): disable platform qualification, once it's used here */
+        /* TODO(cbiffle): pass this in the sel_ldr flags portion of the
+           sel_universal commandline options. I.e., fix scons invocations
+           etc. so that we don't need this special case here */
+        pass_pq_disable = 1;
         break;
       default:
        fputs(kUsage, stderr);
         return -1;
     }
   }
 
   if (NULL == application_name) {
     fprintf(stderr, "-f nacl_file must be specified\n");
     return 1;
@@ skipping 25 matching lines @@
     } else {
       /* application arguments come last. */
       ++module_argc;
     }
   }
 
   /*
    * Prepend the fixed arguments to the command line.
    */
   sel_ldr_argv =
-    (const char**) malloc((pass_debug + sel_ldr_argc
+    (const char**) malloc((pass_debug + pass_pq_disable + sel_ldr_argc
                            + NACL_ARRAY_SIZE(kFixedArgs)) *
                           sizeof(*sel_ldr_argv));
   for (n = 0; n < NACL_ARRAY_SIZE(kFixedArgs); ++n) {
     sel_ldr_argv[n] = kFixedArgs[n];
   }
   for (i = 0; i < sel_ldr_argc; ++i) {
     sel_ldr_argv[i + NACL_ARRAY_SIZE(kFixedArgs)] = tmp_ldr_argv[i];
   }
   if (pass_debug) {
     sel_ldr_argv[sel_ldr_argc + NACL_ARRAY_SIZE(kFixedArgs)] = "-d";
   }
+  if (pass_pq_disable) {
+    sel_ldr_argv[sel_ldr_argc + NACL_ARRAY_SIZE(kFixedArgs) + pass_debug] =
+        "-Q";
+  }
 
   /*
    * Start sel_ldr with the given application and arguments.
    */
   launcher = NaClSelLdrStart(application_name,
                              5,
-                             (pass_debug + sel_ldr_argc
+                             (pass_debug + pass_pq_disable + sel_ldr_argc
                               + NACL_ARRAY_SIZE(kFixedArgs)),
                              (const char**) sel_ldr_argv,
                              module_argc,
                              (const char**) module_argv);
 
   /*
    * Open the communication channels to the service runtime.
    */
   if (!NaClSelLdrOpenSrpcChannels(launcher, &command_channel, &channel)) {
     fprintf(stderr, "Open failed\n");
@@ skipping 12 matching lines @@
   NaClSrpcDtor(&channel);
 
   /*
    * And shut it down.
    */
   NaClSelLdrShutdown(launcher);
 
   NaClNrdAllModulesFini();
   return 0;
 }