diff options
| author | Colin Cross <ccross@android.com> | 2013-01-30 18:03:01 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-30 18:03:01 -0800 |
| commit | 44c116d55f59b6b4839747620e0c6cd299f8e9f8 (patch) | |
| tree | d65a96b0b7ac76da1e8102250dd686379ba6692a | |
| parent | 4ea0ecda33379735259b1eb2b5d137ade5851109 (diff) | |
| parent | 682a27cbce4935a6598c42a248855eb5878c1115 (diff) | |
| download | extras-44c116d55f59b6b4839747620e0c6cd299f8e9f8.tar.gz | |
am 682a27cb: Merge "Fix root inode security labeling issue."
# By Robert Craig
# Via Gerrit Code Review (1) and Robert Craig (1)
* commit '682a27cbce4935a6598c42a248855eb5878c1115':
Fix root inode security labeling issue.
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index 5c1003d3..f62fee9f 100644 --- a/ext4_utils/make_ext4fs.c +++ b/ext4_utils/make_ext4fs.c @@ -568,8 +568,10 @@ int make_ext4fs_internal(int fd, const char *_directory, if (selabel_lookup(sehnd, &secontext, mountpoint, S_IFDIR) < 0) { error("cannot lookup security context for %s", mountpoint); } - if (secontext && verbose) { - printf("Labeling %s as %s\n", mountpoint, secontext); + if (secontext) { + if (verbose) { + printf("Labeling %s as %s\n", mountpoint, secontext); + } inode_set_selinux(root_inode_num, secontext); } freecon(secontext); |