Permalink
Browse files

am d66b3e8: Merge "Modiy mkyaffsimage for SELinux."

* commit 'd66b3e8898579431a5eb66e4470989e534ef3e73':
  Modiy mkyaffsimage for SELinux.
  • Loading branch information...
2 parents bef82d3 + d66b3e8 commit 9c64cac7542658f85417d651d8b9422e054d5e72 @nickkral nickkral committed with Android Git Automerger Jul 19, 2012
Showing with 36 additions and 7 deletions.
  1. +36 −7 yaffs2/utils/mkyaffs2image.c
@@ -382,12 +382,26 @@ static int process_directory(int parent, const char *path, int fixstats)
mntpoint, suffix);
exit(1);
}
+
+ char *sepath = NULL;
+ if (dest_name[0] == '/')
+ sepath = strdup(dest_name);
+ else if (asprintf(&sepath, "/%s", dest_name) < 0)
+ sepath = NULL;
+
+ if (!sepath) {
+ perror("malloc");
+ exit(1);
+ }
+
if (selabel_lookup(sehnd, &secontext,
- dest_name,
+ sepath,
stats.st_mode) < 0) {
- perror("selabel_lookup");
- exit(1);
+ perror("selabel_lookup");
+ free(sepath);
+ exit(1);
}
+ free(sepath);
}
#endif
@@ -636,10 +650,25 @@ int main(int argc, char *argv[])
//printf("Processing directory %s into image file %s\n",dir,image);
#ifdef HAVE_SELINUX
if (sehnd) {
- if (selabel_lookup(sehnd, &secontext, mntpoint, stats.st_mode) < 0) {
- perror("selabel_lookup");
- exit(1);
- }
+
+ char *sepath = NULL;
+ if (mntpoint[0] == '/')
+ sepath = strdup(mntpoint);
+ else if (asprintf(&sepath, "/%s", mntpoint) < 0)
+ sepath = NULL;
+
+ if (!sepath) {
+ perror("malloc");
+ exit(1);
+ }
+
+ if (selabel_lookup(sehnd, &secontext, sepath, stats.st_mode) < 0) {
+ perror("selabel_lookup");
+ free(sepath);
+ exit(1);
+ }
+
+ free(sepath);
}
#endif

0 comments on commit 9c64cac

Please sign in to comment.