Merge branch 'linux-linaro-lsk-v3.18' into linux-linaro-lsk-v3.18-android

* linux-linaro-lsk-v3.18: (237 commits)
  Linux 3.18.19
  x86/xen: allow privcmd hypercalls to be preempted
  rtnl: restore notifications for deleted interfaces
  Input: synaptics - add min/max quirk for Lenovo S540
  Revert "Input: synaptics - add min/max quirk for Lenovo S540"
  Revert "nfs: take extra reference to fl->fl_file when running a LOCKU operation"
  fs/ufs: restore s_lock mutex_init()
  ufs: Fix possible deadlock when looking up directories
  ufs: Fix warning from unlock_new_inode()
  vfs: Ignore unlocked mounts in fs_fully_visible
  KVM: x86: properly restore LVT0
  KVM: s390: virtio-ccw: don't overwrite config space values
  selinux: fix setting of security labels on NFS
  usb: gadget: f_fs: add extra check before unregister_gadget_item
  perf/x86: Honor the architectural performance monitoring version
  perf: Fix ring_buffer_attach() RCU sync, again
  x86/boot: Fix overflow warning with 32-bit binutils
  vfs: Remove incorrect debugging WARN in prepend_path
  KVM: x86: make vapics_in_nmi_mode atomic
  arm: KVM: force execution of HCPTR access on VM exit
  ...

Conflicts:
	security/selinux/hooks.c

Resolution summary:

  Conflict between upstream LTS commit f0f61c29dfb0 (selinux: fix
  setting of security labels on NFS) and android-3.18 commit 96f8
  bcf4a398 (pstore: selinux: add security in-core xattr support for
  pstore and debugfs.)  Resolution: simple combination.

4 files changed, 6 insertions, 4 deletions

diff --git a/security/integrity/ima/ima.h b/security/integrity/ima/ima.h
index 8ee997dff139..fc56d4dfa954 100644
--- a/security/integrity/ima/ima.h
+++ b/security/integrity/ima/ima.h
@@ -106,7 +106,7 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
 		       const char *op, const char *cause);
 int ima_init_crypto(void);
 void ima_putc(struct seq_file *m, void *data, int datalen);
-void ima_print_digest(struct seq_file *m, u8 *digest, int size);
+void ima_print_digest(struct seq_file *m, u8 *digest, u32 size);
 struct ima_template_desc *ima_template_desc_current(void);
 int ima_init_template(void);
 
diff --git a/security/integrity/ima/ima_fs.c b/security/integrity/ima/ima_fs.c
index da92fcc08d15..d30afe461070 100644
--- a/security/integrity/ima/ima_fs.c
+++ b/security/integrity/ima/ima_fs.c
@@ -186,9 +186,9 @@ static const struct file_operations ima_measurements_ops = {
 	.release = seq_release,
 };
 
-void ima_print_digest(struct seq_file *m, u8 *digest, int size)
+void ima_print_digest(struct seq_file *m, u8 *digest, u32 size)
 {
-	int i;
+	u32 i;
 
 	for (i = 0; i < size; i++)
 		seq_printf(m, "%02x", *(digest + i));
diff --git a/security/integrity/ima/ima_template_lib.c b/security/integrity/ima/ima_template_lib.c
index 1506f0248572..1eb173ddefd6 100644
--- a/security/integrity/ima/ima_template_lib.c
+++ b/security/integrity/ima/ima_template_lib.c
@@ -70,7 +70,8 @@ static void ima_show_template_data_ascii(struct seq_file *m,
 					 enum data_formats datafmt,
 					 struct ima_field_data *field_data)
 {
-	u8 *buf_ptr = field_data->data, buflen = field_data->len;
+	u8 *buf_ptr = field_data->data;
+	u32 buflen = field_data->len;
 
 	switch (datafmt) {
 	case DATA_FMT_DIGEST_WITH_ALGO:
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index 946120d21663..cdce4947ebd5 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -406,6 +406,7 @@ static int selinux_is_sblabel_mnt(struct super_block *sb)
 	return sbsec->behavior == SECURITY_FS_USE_XATTR ||
 		sbsec->behavior == SECURITY_FS_USE_TRANS ||
 		sbsec->behavior == SECURITY_FS_USE_TASK ||
+		sbsec->behavior == SECURITY_FS_USE_NATIVE ||
 		/* Special handling. Genfs but also in-core setxattr handler */
 		!strcmp(sb->s_type->name, "sysfs") ||
 		!strcmp(sb->s_type->name, "pstore") ||