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

Unverified Commit a8804204 authored by Michael Bestas's avatar Michael Bestas
Browse files

Merge tag 'ASB-2024-04-05_4.19-stable' of... 

Merge tag 'ASB-2024-04-05_4.19-stable' of https://android.googlesource.com/kernel/common into android13-4.19-kona

https://source.android.com/docs/security/bulletin/2024-04-01

* tag 'ASB-2024-04-05_4.19-stable' of https://android.googlesource.com/kernel/common:
  Revert "Reapply "cred: switch to using atomic_long_t""
  Reapply "cred: switch to using atomic_long_t"
  BACKPORT: net: core: enable SO_BINDTODEVICE for non-root users
  tcp: Add memory barrier to tcp_push()
  tracing: Ensure visibility when inserting an element into tracing_map
  net/rds: Fix UBSAN: array-index-out-of-bounds in rds_cmsg_recv
  llc: Drop support for ETH_P_TR_802_2.
  llc: make llc_ui_sendmsg() more robust against bonding changes
  vlan: skip nested type that is not IFLA_VLAN_QOS_MAPPING
  net/smc: fix illegal rmb_desc access in SMC-D connection dump
  drivers: core: fix kernel-doc markup for dev_err_probe()
  driver code: print symbolic error code
  block: Remove special-casing of compound pages
  Revert "driver core: Annotate dev_err_probe() with __must_check"
  nouveau/vmm: don't set addr on the fail path to avoid warning
  driver core: Annotate dev_err_probe() with __must_check
  parisc/firmware: Fix F-extend for PDC addresses
  x86/CPU/AMD: Fix disabling XSAVES on AMD family 0x17 due to erratum
  rpmsg: virtio: Free driver_override when rpmsg_remove()
  powerpc: Use always instead of always-y in for crtsavres.o
  hwrng: core - Fix page fault dead lock on mmap-ed hwrng
  PM: hibernate: Enforce ordering during image compression/decompression
  crypto: api - Disallow identical driver names
  ext4: allow for the last group to be marked as trimmed
  serial: sc16is7xx: add check for unsupported SPI modes during probe
  spi: introduce SPI_MODE_X_MASK macro
  driver core: add device probe log helper
  serial: sc16is7xx: set safe default SPI clock frequency
  units: add the HZ macros
  units: change from 'L' to 'UL'
  units: Add Watt units
  include/linux/units.h: add helpers for kelvin to/from Celsius conversion
  PCI: mediatek: Clear interrupt status before dispatching handler

Change-Id: I5a5f215e11cc4d2ae7ad65c53d50819f18988acf
parents 706e7d5e 08d0950c

arch/parisc/kernel/firmware.c

+2 −2
Original line number Diff line number Diff line
@@ -127,10 +127,10 @@ static unsigned long f_extend(unsigned long address) 
#ifdef CONFIG_64BIT

	if(unlikely(parisc_narrow_firmware)) {

		if((address & 0xff000000) == 0xf0000000)

			return 0xf0f0f0f000000000UL | (u32)address;

			return (0xfffffff0UL << 32) | (u32)address;



		if((address & 0xf0000000) == 0xf0000000)

			return 0xffffffff00000000UL | (u32)address;

			return (0xffffffffUL << 32) | (u32)address;

	}

#endif

	return address;

arch/powerpc/lib/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -21,8 +21,8 @@ obj-$(CONFIG_PPC32) += div64.o copy_32.o crtsavres.o strlen_32.o 
# 64-bit linker creates .sfpr on demand for final link (vmlinux),

# so it is only needed for modules, and only for older linkers which

# do not support --save-restore-funcs

ifeq ($(call ld-ifversion, -lt, 225000000, y),y)

always-$(CONFIG_PPC64)	+= crtsavres.o

ifeq ($(call ld-ifversion, -lt, 225000000, y)$(CONFIG_PPC64),yy)

always	+= crtsavres.o

endif



obj-$(CONFIG_PPC_BOOK3S_64) += copyuser_power7.o copypage_power7.o \

arch/x86/kernel/cpu/amd.c

+11 −9
Original line number Diff line number Diff line
@@ -271,15 +271,6 @@ 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)
@@ -979,6 +970,17 @@ static void init_amd_zn(struct cpuinfo_x86 *c) 
		if (c->x86 == 0x19 && !cpu_has(c, X86_FEATURE_BTC_NO))

			set_cpu_cap(c, X86_FEATURE_BTC_NO);

	}



	/*

	 * 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.

	 */

	if (c->x86 == 0x17)

		clear_cpu_cap(c, X86_FEATURE_XSAVES);

}



static bool cpu_has_zenbleed_microcode(void)

block/bio.c

+2 −3
Original line number Diff line number Diff line
@@ -1596,7 +1596,6 @@ void bio_set_pages_dirty(struct bio *bio) 
	int i;



	bio_for_each_segment_all(bvec, bio, i) {

		if (!PageCompound(bvec->bv_page))

		set_page_dirty_lock(bvec->bv_page);

	}

}
@@ -1656,7 +1655,7 @@ void bio_check_pages_dirty(struct bio *bio) 
	int i;



	bio_for_each_segment_all(bvec, bio, i) {

		if (!PageDirty(bvec->bv_page) && !PageCompound(bvec->bv_page))

		if (!PageDirty(bvec->bv_page))

			goto defer;

	}

crypto/algapi.c

+1 −0
Original line number Diff line number Diff line
@@ -236,6 +236,7 @@ static struct crypto_larval *__crypto_register_alg(struct crypto_alg *alg) 
		}



		if (!strcmp(q->cra_driver_name, alg->cra_name) ||

		    !strcmp(q->cra_driver_name, alg->cra_driver_name) ||

		    !strcmp(q->cra_name, alg->cra_driver_name))

			goto err;

	}