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

Commit 71ef7ce1 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 4.19.278 into android-4.19-stable 



Changes in 4.19.278
	fs: prevent out-of-bounds array speculation when closing a file descriptor
	x86/CPU/AMD: Disable XSAVES on AMD family 0x17
	ext4: fix RENAME_WHITEOUT handling for inline directories
	ext4: fix another off-by-one fsmap error on 1k block filesystems
	ext4: move where set the MAY_INLINE_DATA flag is set
	ext4: fix WARNING in ext4_update_inline_data
	ext4: zero i_disksize when initializing the bootloader inode
	nfc: change order inside nfc_se_io error path
	udf: Explain handling of load_nls() failure
	udf: reduce leakage of blocks related to named streams
	udf: Remove pointless union in udf_inode_info
	udf: Preserve link count of system files
	udf: Detect system inodes linked into directory hierarchy
	kbuild: fix false-positive need-builtin calculation
	kbuild: generate modules.order only in directories visited by obj-y/m
	scsi: core: Remove the /proc/scsi/${proc_name} directory earlier
	Revert "spi: mt7621: Fix an error message in mt7621_spi_probe()"
	MIPS: Fix a compilation issue
	alpha: fix R_ALPHA_LITERAL reloc for large modules
	macintosh: windfarm: Use unsigned type for 1-bit bitfields
	PCI: Add SolidRun vendor ID
	media: ov5640: Fix analogue gain control
	tipc: improve function tipc_wait_for_cond()
	drm/i915: Don't use BAR mappings for ring buffers with LLC
	net: caif: Fix use-after-free in cfusbl_device_notify()
	nfc: fdp: add null check of devm_kmalloc_array in fdp_nci_i2c_read_device_properties
	ila: do not generate empty messages in ila_xlat_nl_cmd_get_mapping()
	Linux 4.19.278

Change-Id: I082984fb2dca13b0f44740839121850ea5531acf
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 64e5437b 7e0df88a

Makefile

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

VERSION = 4

PATCHLEVEL = 19

SUBLEVEL = 277

SUBLEVEL = 278

EXTRAVERSION =

NAME = "People's Front"

arch/alpha/kernel/module.c

+1 −3
Original line number Diff line number Diff line
@@ -158,10 +158,8 @@ apply_relocate_add(Elf64_Shdr *sechdrs, const char *strtab, 
	base = (void *)sechdrs[sechdrs[relsec].sh_info].sh_addr;

	symtab = (Elf64_Sym *)sechdrs[symindex].sh_addr;



	/* The small sections were sorted to the end of the segment.

	   The following should definitely cover them.  */

	gp = (u64)me->core_layout.base + me->core_layout.size - 0x8000;

	got = sechdrs[me->arch.gotsecindex].sh_addr;

	gp = got + 0x8000;



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

		unsigned long r_sym = ELF64_R_SYM (rela[i].r_info);

arch/mips/include/asm/mach-rc32434/pci.h

+1 −1
Original line number Diff line number Diff line
@@ -377,7 +377,7 @@ struct pci_msu { 
				 PCI_CFG04_STAT_SSE | \

				 PCI_CFG04_STAT_PE)



#define KORINA_CNFG1		((KORINA_STAT<<16)|KORINA_CMD)

#define KORINA_CNFG1		(KORINA_STAT | KORINA_CMD)



#define KORINA_REVID		0

#define KORINA_CLASS_CODE	0

arch/x86/kernel/cpu/amd.c

+9 −0
Original line number Diff line number Diff line
@@ -199,6 +199,15 @@ static void init_amd_k6(struct cpuinfo_x86 *c) 
		return;

	}

#endif

	/*

	 * Work around Erratum 1386.  The XSAVES instruction malfunctions in

	 * certain circumstances on Zen1/2 uarch, and not all parts have had

	 * updated microcode at the time of writing (March 2023).

	 *

	 * Affected parts all have no supervisor XSAVE states, meaning that

	 * the XSAVEC instruction (which works fine) is equivalent.

	 */

	clear_cpu_cap(c, X86_FEATURE_XSAVES);

}



static void init_amd_k7(struct cpuinfo_x86 *c)

drivers/gpu/drm/i915/intel_ringbuffer.c

+2 −2
Original line number Diff line number Diff line
@@ -1083,7 +1083,7 @@ int intel_ring_pin(struct intel_ring *ring, 
	if (unlikely(ret))

		return ret;



	if (i915_vma_is_map_and_fenceable(vma))

	if (i915_vma_is_map_and_fenceable(vma) && !HAS_LLC(vma->vm->i915))

		addr = (void __force *)i915_vma_pin_iomap(vma);

	else

		addr = i915_gem_object_pin_map(vma->obj, map);
@@ -1118,7 +1118,7 @@ void intel_ring_unpin(struct intel_ring *ring) 
	/* Discard any unused bytes beyond that submitted to hw. */

	intel_ring_reset(ring, ring->tail);



	if (i915_vma_is_map_and_fenceable(ring->vma))

	if (i915_vma_is_map_and_fenceable(ring->vma) && !HAS_LLC(ring->vma->vm->i915))

		i915_vma_unpin_iomap(ring->vma);

	else

		i915_gem_object_unpin_map(ring->vma->obj);