minor fix for security code

Pal/src/security/Linux/Makefile

@@ -5,7 +5,7 @@ LD	= ld
 
 CFLAGS	= -Wall -fPIC -O2 -std=gnu99 -fgnu89-inline -Wall -U_FORTIFY_SOURCE \
 	  -fno-stack-protector -fno-builtin \
-	  -DPALDIR="$(shell readlink -f ../..)/" -DIN_PAL \
+	  -DPAL_LOADER_PATH="$(shell readlink -f ../../pal)" -DIN_PAL \
 	  -I. -I../.. -I../../../include -I../../host/Linux \
 	  -I../../../lib -I../../../linux-3.5/graphene
 LDFLAGS	= -shared -nostdlib -z combreloc -z defs --version-script pal-sec.map -e start
@@ -37,5 +37,4 @@ libpal_sec.so: $(addsuffix .o,$(objs)) $(graphene_lib)
 	@$(CC) $(CFLAGS) -E $< -o $@
 
 clean:
-	rm -rf *.o
-	[ ! -f libpal_sec.so ] || mv -f libpal_sec.so libpal_sec.so.backup
+	rm -rf *.o libpal_sec.so

Pal/src/security/Linux/main.c

@@ -562,7 +562,7 @@ void do_main (void * args)
     unsigned long pal_phoff = 0;
     int pal_phnum = 0;
 
-    ret = load_static(LIBPAL_PATH, &pal_entry, &pal_addr, &pal_start, &pal_end,
+    ret = load_static(PAL_LOADER, &pal_entry, &pal_addr, &pal_start, &pal_end,
                       &pal_phoff, &pal_phnum);
     if (ret < 0) {
         printf("Unable to load PAL loader\n");
@@ -638,7 +638,6 @@ void do_main (void * args)
     mcast_c(&mcast_handle, mcast_port);
     mcast_handle.mcast.port = mcast_port;
 
-    pal_sec_info_addr->pal_name     = LIBPAL_PATH;
     pal_sec_info_addr->domain_id    = domainid;
     pal_sec_info_addr->pipe_prefix  = pipe_prefix;
     pal_sec_info_addr->rand_gen     = rand;

Pal/src/security/Linux/utils.h

@@ -10,7 +10,7 @@
 
 #include "api.h"
 
-#define LIBPAL_PATH  XSTRINGIFY(PALDIR) "libpal.so"
+#define PAL_LOADER  XSTRINGIFY(PAL_LOADER_PATH)
 
 #ifdef __x86_64__
 # include "sysdep-x86_64.h"

Pal/src/security/Linux/wrapper.c

@@ -48,7 +48,7 @@ int init_child (int argc, const char ** argv, const char ** envp)
     mcast_rules[1].peer.port_end = pal_sec_info_addr->mcast_port;
 
     const struct graphene_user_policy default_policies[] = {
-        { .type = GRAPHENE_LIB_NAME,     .value = LIBPAL_PATH, },
+        { .type = GRAPHENE_LIB_NAME,     .value = PAL_LOADER, },
         { .type = GRAPHENE_LIB_ADDR,     .value = (void *) pal_addr, },
         { .type = GRAPHENE_UNIX_ROOT,    .value = pipe_root, },
         { .type = GRAPHENE_UNIX_PREFIX,  .value = pipe_prefix, },