Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 36dda914 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 5.4.191 into android11-5.4-lts 



Changes in 5.4.191
	etherdevice: Adjust ether_addr* prototypes to silence -Wstringop-overead
	mm: page_alloc: fix building error on -Werror=array-compare
	tracing: Dump stacktrace trigger to the corresponding instance
	can: usb_8dev: usb_8dev_start_xmit(): fix double dev_kfree_skb() in error path
	gfs2: assign rgrp glock before compute_bitstructs
	tcp: fix race condition when creating child sockets from syncookies
	net/sched: cls_u32: fix netns refcount changes in u32_change()
	tcp: Fix potential use-after-free due to double kfree()
	ALSA: usb-audio: Clear MIDI port active flag after draining
	ASoC: atmel: Remove system clock tree configuration for at91sam9g20ek
	ASoC: msm8916-wcd-digital: Check failure for devm_snd_soc_register_component
	dmaengine: imx-sdma: Fix error checking in sdma_event_remap
	dmaengine: mediatek:Fix PM usage reference leak of mtk_uart_apdma_alloc_chan_resources
	igc: Fix infinite loop in release_swfw_sync
	igc: Fix BUG: scheduling while atomic
	rxrpc: Restore removed timer deletion
	net/smc: Fix sock leak when release after smc_shutdown()
	net/packet: fix packet_sock xmit return value checking
	net/sched: cls_u32: fix possible leak in u32_init_knode()
	l3mdev: l3mdev_master_upper_ifindex_by_index_rcu should be using netdev_master_upper_dev_get_rcu
	netlink: reset network and mac headers in netlink_dump()
	selftests: mlxsw: vxlan_flooding: Prevent flooding of unwanted packets
	ARM: vexpress/spc: Avoid negative array index when !SMP
	reset: tegra-bpmp: Restore Handle errors in BPMP response
	platform/x86: samsung-laptop: Fix an unsigned comparison which can never be negative
	ALSA: usb-audio: Fix undefined behavior due to shift overflowing the constant
	vxlan: fix error return code in vxlan_fdb_append
	cifs: Check the IOCB_DIRECT flag, not O_DIRECT
	mt76: Fix undefined behavior due to shift overflowing the constant
	brcmfmac: sdio: Fix undefined behavior due to shift overflowing the constant
	dpaa_eth: Fix missing of_node_put in dpaa_get_ts_info()
	drm/msm/mdp5: check the return of kzalloc()
	net: macb: Restart tx only if queue pointer is lagging
	scsi: qedi: Fix failed disconnect handling
	stat: fix inconsistency between struct stat and struct compat_stat
	EDAC/synopsys: Read the error count from the correct register
	oom_kill.c: futex: delay the OOM reaper to allow time for proper futex cleanup
	ata: pata_marvell: Check the 'bmdma_addr' beforing reading
	dma: at_xdmac: fix a missing check on list iterator
	drm/panel/raspberrypi-touchscreen: Avoid NULL deref if not initialised
	drm/panel/raspberrypi-touchscreen: Initialise the bridge in prepare
	KVM: PPC: Fix TCE handling for VFIO
	drm/vc4: Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage
	powerpc/perf: Fix power9 event alternatives
	xtensa: patch_text: Fixup last cpu should be master
	xtensa: fix a7 clobbering in coprocessor context load/store
	openvswitch: fix OOB access in reserve_sfa_size()
	ASoC: soc-dapm: fix two incorrect uses of list iterator
	e1000e: Fix possible overflow in LTR decoding
	ARC: entry: fix syscall_trace_exit argument
	arm_pmu: Validate single/group leader events
	ext4: fix symlink file size not match to file content
	ext4: fix use-after-free in ext4_search_dir
	ext4: limit length to bitmap_maxbytes - blocksize in punch_hole
	ext4, doc: fix incorrect h_reserved size
	ext4: fix overhead calculation to account for the reserved gdt blocks
	ext4: force overhead calculation if the s_overhead_cluster makes no sense
	jbd2: fix a potential race while discarding reserved buffers after an abort
	spi: atmel-quadspi: Fix the buswidth adjustment between spi-mem and controller
	staging: ion: Prevent incorrect reference counting behavour
	block/compat_ioctl: fix range check in BLKGETSIZE
	Revert "net: micrel: fix KS8851_MLL Kconfig"
	Linux 5.4.191

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
Change-Id: Id8dee2348cd339ea32e592787839af337292ad17
parents af912bfb 4426e601

Documentation/filesystems/ext4/attributes.rst

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ The beginning of an extended attribute block is in 
     - Checksum of the extended attribute block.

   * - 0x14

     - \_\_u32

     - h\_reserved[2]

     - h\_reserved[3]

     - Zero.



The checksum is calculated against the FS UUID, the 64-bit block number

Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

VERSION = 5

PATCHLEVEL = 4

SUBLEVEL = 190

SUBLEVEL = 191

EXTRAVERSION =

NAME = Kleptomaniac Octopus

arch/arc/kernel/entry.S

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ tracesys_exit: 
	st  r0, [sp, PT_r0]     ; sys call return value in pt_regs



	;POST Sys Call Ptrace Hook

	mov r0, sp		; pt_regs needed

	bl  @syscall_trace_exit

	b   ret_from_exception ; NOT ret_from_system_call at is saves r0 which

	; we'd done before calling post hook above

arch/arm/mach-vexpress/spc.c

+1 −1
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ static int __init ve_spc_clk_init(void) 
		}



		cluster = topology_physical_package_id(cpu_dev->id);

		if (init_opp_table[cluster])

		if (cluster < 0 || init_opp_table[cluster])

			continue;



		if (ve_init_opp_table(cpu_dev))

arch/powerpc/kvm/book3s_64_vio.c

+23 −22
Original line number Diff line number Diff line
@@ -420,13 +420,19 @@ static void kvmppc_tce_put(struct kvmppc_spapr_tce_table *stt, 
	tbl[idx % TCES_PER_PAGE] = tce;

}



static void kvmppc_clear_tce(struct mm_struct *mm, struct iommu_table *tbl,

		unsigned long entry)

static void kvmppc_clear_tce(struct mm_struct *mm, struct kvmppc_spapr_tce_table *stt,

		struct iommu_table *tbl, unsigned long entry)

{

	unsigned long i;

	unsigned long subpages = 1ULL << (stt->page_shift - tbl->it_page_shift);

	unsigned long io_entry = entry << (stt->page_shift - tbl->it_page_shift);



	for (i = 0; i < subpages; ++i) {

		unsigned long hpa = 0;

		enum dma_data_direction dir = DMA_NONE;



	iommu_tce_xchg_no_kill(mm, tbl, entry, &hpa, &dir);

		iommu_tce_xchg_no_kill(mm, tbl, io_entry + i, &hpa, &dir);

	}

}



static long kvmppc_tce_iommu_mapped_dec(struct kvm *kvm,
@@ -485,6 +491,8 @@ static long kvmppc_tce_iommu_unmap(struct kvm *kvm, 
			break;

	}



	iommu_tce_kill(tbl, io_entry, subpages);



	return ret;

}
@@ -544,6 +552,8 @@ static long kvmppc_tce_iommu_map(struct kvm *kvm, 
			break;

	}



	iommu_tce_kill(tbl, io_entry, subpages);



	return ret;

}
@@ -590,10 +600,9 @@ long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn, 
			ret = kvmppc_tce_iommu_map(vcpu->kvm, stt, stit->tbl,

					entry, ua, dir);



		iommu_tce_kill(stit->tbl, entry, 1);



		if (ret != H_SUCCESS) {

			kvmppc_clear_tce(vcpu->kvm->mm, stit->tbl, entry);

			kvmppc_clear_tce(vcpu->kvm->mm, stt, stit->tbl, entry);

			goto unlock_exit;

		}

	}
@@ -669,13 +678,13 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
		 */

		if (get_user(tce, tces + i)) {

			ret = H_TOO_HARD;

			goto invalidate_exit;

			goto unlock_exit;

		}

		tce = be64_to_cpu(tce);



		if (kvmppc_tce_to_ua(vcpu->kvm, tce, &ua)) {

			ret = H_PARAMETER;

			goto invalidate_exit;

			goto unlock_exit;

		}



		list_for_each_entry_lockless(stit, &stt->iommu_tables, next) {
@@ -684,19 +693,15 @@ long kvmppc_h_put_tce_indirect(struct kvm_vcpu *vcpu, 
					iommu_tce_direction(tce));



			if (ret != H_SUCCESS) {

				kvmppc_clear_tce(vcpu->kvm->mm, stit->tbl,

						entry);

				goto invalidate_exit;

				kvmppc_clear_tce(vcpu->kvm->mm, stt, stit->tbl,

						 entry + i);

				goto unlock_exit;

			}

		}



		kvmppc_tce_put(stt, entry + i, tce);

	}



invalidate_exit:

	list_for_each_entry_lockless(stit, &stt->iommu_tables, next)

		iommu_tce_kill(stit->tbl, entry, npages);



unlock_exit:

	srcu_read_unlock(&vcpu->kvm->srcu, idx);
@@ -735,20 +740,16 @@ long kvmppc_h_stuff_tce(struct kvm_vcpu *vcpu, 
				continue;



			if (ret == H_TOO_HARD)

				goto invalidate_exit;

				return ret;



			WARN_ON_ONCE(1);

			kvmppc_clear_tce(vcpu->kvm->mm, stit->tbl, entry);

			kvmppc_clear_tce(vcpu->kvm->mm, stt, stit->tbl, entry + i);

		}

	}



	for (i = 0; i < npages; ++i, ioba += (1ULL << stt->page_shift))

		kvmppc_tce_put(stt, ioba >> stt->page_shift, tce_value);



invalidate_exit:

	list_for_each_entry_lockless(stit, &stt->iommu_tables, next)

		iommu_tce_kill(stit->tbl, ioba >> stt->page_shift, npages);



	return ret;

}

EXPORT_SYMBOL_GPL(kvmppc_h_stuff_tce);