Merge pull request #71 from sean-jc/master

lzha101 · web-flow · commit ddec9f8725b5 · 2017-02-16T13:47:12.000+08:00
Bug fix - mprotect may be called with wrong flags

Signed-off-by:  lzha101 &lt;lili.z.zhang@intel.com&gt;
diff --git a/psw/urts/loader.cpp b/psw/urts/loader.cpp
@@ -752,7 +752,7 @@ int CLoader::set_context_protection(layout_t *layout_start, layout_t *layout_end
         if (!IS_GROUP_ID(layout->group.id))
         {
             int prot = 0 ;
-            if(layout->entry.attributes == SI_FLAG_NONE)
+            if(layout->entry.si_flags == SI_FLAG_NONE)
             {
                 prot = SI_FLAG_NONE & SI_MASK_MEM_ATTRIBUTE;
             }

Original file line number	Diff line number	Diff line change
`@@ -752,7 +752,7 @@ int CLoader::set_context_protection(layout_t layout_start, layout_t layout_end`
`752`	`752`	`if (!IS_GROUP_ID(layout->group.id))`
`753`	`753`	`{`
`754`	`754`	`int prot = 0 ;`
`755`		`- if(layout->entry.attributes == SI_FLAG_NONE)`
	`755`	`+ if(layout->entry.si_flags == SI_FLAG_NONE)`
`756`	`756`	`{`
`757`	`757`	`prot = SI_FLAG_NONE & SI_MASK_MEM_ATTRIBUTE;`
`758`	`758`	`}`