Merge 4.4.253 into android-4.4-p

Changes in 4.4.253
	ASoC: dapm: remove widget from dirty list on free
	mm/hugetlb: fix potential missing huge page size info
	ext4: fix bug for rename with RENAME_WHITEOUT
	ARC: build: add boot_targets to PHONY
	ethernet: ucc_geth: fix definition and size of ucc_geth_tx_global_pram
	arch/arc: add copy_user_page() to <asm/page.h> to fix build error on ARC
	misdn: dsp: select CONFIG_BITREVERSE
	net: ethernet: fs_enet: Add missing MODULE_LICENSE
	ACPI: scan: add stub acpi_create_platform_device() for !CONFIG_ACPI
	ARM: picoxcell: fix missing interrupt-parent properties
	Input: uinput - avoid FF flush when destroying device
	dump_common_audit_data(): fix racy accesses to ->d_name
	NFS: nfs_igrab_and_active must first reference the superblock
	ext4: fix superblock checksum failure when setting password salt
	RDMA/usnic: Fix memleak in find_free_vf_and_create_qp_grp
	mm, slub: consider rest of partial list if acquire_slab() fails
	net: sunrpc: interpret the return value of kstrtou32 correctly
	usb: ohci: Make distrust_firmware param default to false
	iio: buffer: Fix demux update
	nfsd4: readdirplus shouldn't return parent of export
	net: cdc_ncm: correct overhead in delayed_ndp_size
	netxen_nic: fix MSI/MSI-x interrupts
	rndis_host: set proper input size for OID_GEN_PHYSICAL_MEDIUM request
	net: dcb: Validate netlink message in DCB handler
	net: dcb: Accept RTM_GETDCB messages carrying set-like DCB commands
	net: sit: unregister_netdevice on newlink's error path
	rxrpc: Fix handling of an unsupported token type in rxrpc_read()
	net: avoid 32 x truesize under-estimation for tiny skbs
	spi: cadence: cache reference clock rate during probe
	Linux 4.4.253

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: I654eb9f2b62aea6745aeae37341e162ab2a6a596

1 files changed, 5 insertions, 2 deletions

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index d0b74c12d56d..24ea1eeee9cd 100644
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -264,7 +264,9 @@ static void dump_common_audit_data(struct audit_buffer *ab,
 		struct inode *inode;
 
 		audit_log_format(ab, " name=");
+		spin_lock(&a->u.dentry->d_lock);
 		audit_log_untrustedstring(ab, a->u.dentry->d_name.name);
+		spin_unlock(&a->u.dentry->d_lock);
 
 		inode = d_backing_inode(a->u.dentry);
 		if (inode) {
@@ -282,8 +284,9 @@ static void dump_common_audit_data(struct audit_buffer *ab,
 		dentry = d_find_alias(inode);
 		if (dentry) {
 			audit_log_format(ab, " name=");
-			audit_log_untrustedstring(ab,
-					 dentry->d_name.name);
+			spin_lock(&dentry->d_lock);
+			audit_log_untrustedstring(ab, dentry->d_name.name);
+			spin_unlock(&dentry->d_lock);
 			dput(dentry);
 		}
 		audit_log_format(ab, " dev=");