diff options
| author | Srinivasarao P <spathi@codeaurora.org> | 2018-10-15 14:35:13 +0530 |
|---|---|---|
| committer | Srinivasarao P <spathi@codeaurora.org> | 2018-10-15 14:35:31 +0530 |
| commit | 02d722f11f25bf90751ea82888850501cc255629 (patch) | |
| tree | 3fd8c2ffc1418d82cfe8f0dcd0a21aafbe3ff512 /fs/ext4/xattr.c | |
| parent | f25fed271059c7a4afe6db46f085e80e2c4db073 (diff) | |
| parent | 8e7f196597f3f917aa4825b296bdc3082f669f8d (diff) | |
Merge android-4.4.161 (8e7f196) into msm-4.4
* refs/heads/tmp-8e7f196
Linux 4.4.161
ebtables: arpreply: Add the standard target sanity check
ath10k: fix scan crash due to incorrect length calculation
tcp: add tcp_ooo_try_coalesce() helper
tcp: call tcp_drop() from tcp_data_queue_ofo()
tcp: free batches of packets in tcp_prune_ofo_queue()
tcp: fix a stale ooo_last_skb after a replace
tcp: use an RB tree for ooo receive queue
tcp: increment sk_drops for dropped rx packets
ubifs: Check for name being NULL while mounting
ucma: fix a use-after-free in ucma_resolve_ip()
ARC: clone syscall to setp r25 as thread pointer
powerpc/fadump: Return error when fadump registration fails
ath10k: fix use-after-free in ath10k_wmi_cmd_send_nowait
cgroup: Fix deadlock in cpu hotplug path
ext4: always verify the magic number in xattr blocks
of: unittest: Disable interrupt node tests for old world MAC systems
USB: serial: simple: add Motorola Tetra MTP6550 id
xhci: Add missing CAS workaround for Intel Sunrise Point xHCI
dm cache: fix resize crash if user doesn't reload cache table
PM / core: Clear the direct_complete flag on errors
mac80211: fix setting IEEE80211_KEY_FLAG_RX_MGMT for AP mode keys
PCI: Reprogram bridge prefetch registers on resume
x86/vdso: Fix vDSO syscall fallback asm constraint regression
x86/vdso: Fix asm constraints on vDSO syscall fallbacks
fbdev/omapfb: fix omapfb_memory_read infoleak
mm/vmstat.c: skip NR_TLB_REMOTE_FLUSH* properly
Change-Id: If31f9e57679a3b1deb1049c86aeaead5ccbd64a6
Signed-off-by: Srinivasarao P <spathi@codeaurora.org>
Diffstat (limited to 'fs/ext4/xattr.c')
| -rw-r--r-- | fs/ext4/xattr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/ext4/xattr.c b/fs/ext4/xattr.c index 45cbea6107e2..4d0365a55841 100644 --- a/fs/ext4/xattr.c +++ b/fs/ext4/xattr.c @@ -220,12 +220,12 @@ ext4_xattr_check_block(struct inode *inode, struct buffer_head *bh) { int error; - if (buffer_verified(bh)) - return 0; - if (BHDR(bh)->h_magic != cpu_to_le32(EXT4_XATTR_MAGIC) || BHDR(bh)->h_blocks != cpu_to_le32(1)) return -EFSCORRUPTED; + if (buffer_verified(bh)) + return 0; + if (!ext4_xattr_block_csum_verify(inode, bh->b_blocknr, BHDR(bh))) return -EFSBADCRC; error = ext4_xattr_check_names(BFIRST(bh), bh->b_data + bh->b_size, |