Merge 4.9.28 into android-4.9

Changes in 4.9.28
	9p: fix a potential acl leak
	drm/sti: fix GDP size to support up to UHD resolution
	hwmon: (it87) Fix pwm4 detection for IT8620 and IT8628
	tpm: fix RC value check in tpm2_seal_trusted
	tmp: use pdev for parent device in tpm_chip_alloc
	crypto: caam - fix error path for ctx_dma mapping failure
	power: supply: lp8788: prevent out of bounds array access
	cpupower: Fix turbo frequency reporting for pre-Sandy Bridge cores
	powerpc/mm: Fixup wrong LPCR_VRMASD value
	powerpc/powernv: Fix opal_exit tracepoint opcode
	powerpc/ftrace: Fix confusing help text for DISABLE_MPROFILE_KERNEL
	powerpc: Correctly disable latent entropy GCC plugin on prom_init.o
	perf/x86/intel/pt: Add format strings for PTWRITE and power event tracing
	power: supply: bq24190_charger: Fix irq trigger to IRQF_TRIGGER_FALLING
	power: supply: bq24190_charger: Call set_mode_host() on pm_resume()
	power: supply: bq24190_charger: Install irq_handler_thread() at end of probe()
	power: supply: bq24190_charger: Call power_supply_changed() for relevant component
	power: supply: bq24190_charger: Don't read fault register outside irq_handle_thread()
	power: supply: bq24190_charger: Handle fault before status on interrupt
	arm64: dts: r8a7795: Mark EthernetAVB device node disabled
	arm: dts: qcom: Fix ipq board clock rates
	arm64: Improve detection of user/non-user mappings in set_pte(_at)
	leds: ktd2692: avoid harmless maybe-uninitialized warning
	ARM: dts: NSP: GPIO reboot open-source
	ARM: OMAP5 / DRA7: Fix HYP mode boot for thumb2 build
	ARM: dts: sun7i: lamobo-r1: Fix CPU port RGMII settings
	mwifiex: debugfs: Fix (sometimes) off-by-1 SSID print
	mwifiex: remove redundant dma padding in AMSDU
	mwifiex: Avoid skipping WEP key deletion for AP
	iwlwifi: fix MODULE_FIRMWARE for 6030
	iwlwifi: mvm: don't restart HW if suspend fails with unified image
	iwlwifi: mvm: overwrite skb info later
	iwlwifi: pcie: don't increment / decrement a bool
	iwlwifi: pcie: trans: Remove unused 'shift_param'
	iwlwifi: pcie: fix the set of DMA memory mask
	iwlwifi: mvm: fix reorder timer re-arming
	iwlwifi: mvm: Use aux queue for offchannel frames in dqa
	iwlwifi: mvm/pcie: adjust A-MSDU tx_cmd length in PCIe
	iwlwifi: mvm: fix pending frame counter calculation
	iwlwifi: mvm: fix references to first_agg_queue in DQA mode
	iwlwifi: mvm: synchronize firmware DMA paging memory
	iwlwifi: mvm: writing zero bytes to debugfs causes a crash
	x86/ioapic: Restore IO-APIC irq_chip retrigger callback
	x86/pci-calgary: Fix iommu_free() comparison of unsigned expression >= 0
	x86/mpx: Re-add MPX to selftests Makefile
	clk: Make x86/ conditional on CONFIG_COMMON_CLK
	kprobes/x86: Fix kernel panic when certain exception-handling addresses are probed
	x86/platform/intel-mid: Correct MSI IRQ line for watchdog device
	Revert "KVM: nested VMX: disable perf cpuid reporting"
	KVM: nVMX: initialize PML fields in vmcs02
	KVM: nVMX: do not leak PML full vmexit to L1
	usb: dwc2: host: use msleep() for long delay
	usb: host: ehci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
	usb: host: ohci-exynos: Decrese node refcount on exynos_ehci_get_phy() error paths
	usb: chipidea: Only read/write OTGSC from one place
	usb: chipidea: Handle extcon events properly
	USB: serial: keyspan_pda: fix receive sanity checks
	USB: serial: digi_acceleport: fix incomplete rx sanity check
	USB: serial: ssu100: fix control-message error handling
	USB: serial: io_edgeport: fix epic-descriptor handling
	USB: serial: ti_usb_3410_5052: fix control-message error handling
	USB: serial: ark3116: fix open error handling
	USB: serial: ftdi_sio: fix latency-timer error handling
	USB: serial: quatech2: fix control-message error handling
	USB: serial: mct_u232: fix modem-status error handling
	USB: serial: io_edgeport: fix descriptor error handling
	clk: rockchip: add "," to mux_pll_src_apll_dpll_gpll_usb480m_p on rk3036
	phy: qcom-usb-hs: Add depends on EXTCON
	serial: 8250_omap: Fix probe and remove for PM runtime
	scsi: qla2xxx: Fix crash in qla2xxx_eh_abort on bad ptr
	scsi: mac_scsi: Fix MAC_SCSI=m option when SCSI=m
	scsi: smartpqi: fix time handling
	MIPS: R2-on-R6 MULTU/MADDU/MSUBU emulation bugfix
	brcmfmac: Ensure pointer correctly set if skb data location changes
	brcmfmac: Make skb header writable before use
	staging/lustre/llite: move root_squash from sysfs to debugfs
	staging: wlan-ng: add missing byte order conversion
	staging: emxx_udc: remove incorrect __init annotations
	ALSA: hda - Fix deadlock of controller device lock at unbinding
	sparc64: fix fault handling in NGbzero.S and GENbzero.S
	macsec: dynamically allocate space for sglist
	tcp: do not underestimate skb->truesize in tcp_trim_head()
	bpf: enhance verifier to understand stack pointer arithmetic
	bpf, arm64: fix jit branch offset related to ldimm64
	tcp: fix wraparound issue in tcp_lp
	net: ipv6: Do not duplicate DAD on link up
	net: usb: qmi_wwan: add Telit ME910 support
	tcp: do not inherit fastopen_req from parent
	ipv4, ipv6: ensure raw socket message is big enough to hold an IP header
	rtnetlink: NUL-terminate IFLA_PHYS_PORT_NAME string
	ipv6: initialize route null entry in addrconf_init()
	ipv6: reorder ip6_route_dev_notifier after ipv6_dev_notf
	bnxt_en: allocate enough space for ->ntp_fltr_bmap
	bpf: don't let ldimm64 leak map addresses on unprivileged
	net: mdio-mux: bcm-iproc: call mdiobus_free() in error path
	f2fs: sanity check segment count
	xen: Revert commits da72ff5bfcb0 and 72a9b186292d
	wlcore: Pass win_size taken from ieee80211_sta to FW
	wlcore: Add RX_BA_WIN_SIZE_CHANGE_EVENT event
	drm/ttm: fix use-after-free races in vm fault handling
	block: get rid of blk_integrity_revalidate()
	Linux 4.9.28

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

2 files changed, 7 insertions, 1 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 092a2eed1628..9ad527ff9974 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1165,7 +1165,6 @@ int revalidate_disk(struct gendisk *disk)
 
 	if (disk->fops->revalidate_disk)
 		ret = disk->fops->revalidate_disk(disk);
-	blk_integrity_revalidate(disk);
 	bdev = bdget_disk(disk, 0);
 	if (!bdev)
 		return ret;
diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c
index 013c6a541d6b..7e0c002c12e9 100644
--- a/fs/f2fs/super.c
+++ b/fs/f2fs/super.c
@@ -1405,6 +1405,13 @@ static int sanity_check_raw_super(struct f2fs_sb_info *sbi,
 		return 1;
 	}
 
+	if (le32_to_cpu(raw_super->segment_count) > F2FS_MAX_SEGMENT) {
+		f2fs_msg(sb, KERN_INFO,
+			"Invalid segment count (%u)",
+			le32_to_cpu(raw_super->segment_count));
+		return 1;
+	}
+
 	/* check CP/SIT/NAT/SSA/MAIN_AREA area boundary */
 	if (sanity_check_area_boundary(sbi, bh))
 		return 1;