commit 400e9bc8d3c449da234e70abe319bc2670c94298
author Kenny Root <kroot@android.com> Thu May 31 13:43:49 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 31 13:43:49 2012 -0700
tree c5847cb89fe75b568cf76a3fc278e536c9084f0a
parent d3b93200d1568571cee4d4d8258220a8104d6e1b
parent 47aa1049e80927420b59723806fab579997a7430

am 47aa1049: Merge "Fixes to make_ext4fs when compiled with HAVE_SELINUX."

* commit '47aa1049e80927420b59723806fab579997a7430':
  Fixes to make_ext4fs when compiled with HAVE_SELINUX.

ext4_utils/contents.c

diff --git a/ext4_utils/contents.c b/ext4_utils/contents.c
index de38bb0..345ab1e 100644
--- a/ext4_utils/contents.c
+++ b/ext4_utils/contents.c
@@ -263,7 +263,7 @@
 	u32 *hdr;
 	struct ext4_xattr_entry *entry;
 	size_t name_len = strlen(XATTR_SELINUX_SUFFIX);
-	size_t value_len = strlen(secon)+1;
+	size_t value_len;
 	size_t size, min_offs;
 	char *val;
 
@@ -280,6 +280,7 @@
 	entry->e_name_index = EXT4_XATTR_INDEX_SECURITY;
 	entry->e_name_len = name_len;
 	memcpy(entry->e_name, XATTR_SELINUX_SUFFIX, name_len);
+	value_len = strlen(secon)+1;
 	entry->e_value_size = cpu_to_le32(value_len);
 	min_offs = (char *)inode + info.inode_size - (char*) entry;
 	size = EXT4_XATTR_SIZE(value_len);