github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-11 08:03:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
099bdfba32
linux/arch/arm64/include/asm
History
Tao Huang f6909c028f Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 
https://source.android.com/security/bulletin/2021-12-01
CVE-2021-33909
CVE-2021-38204
CVE-2021-0961

* tag 'ASB-2021-12-05_12-5.10': (3010 commits)
  ANDROID: workqueue: export symbol of the function wq_worker_comm()
  ANDROID: GKI: Update symbols to symbol list
  ANDROID: vendor_hooks: Add hooks for binder proc transaction
  ANDROID: GKI: Add symbols abi for USB IP kernel modules.
  ANDROID: GKI: Fix file mode on mtk abi file
  UPSTREAM: erofs: fix deadlock when shrink erofs slab
  ANDROID: init_task: Init android vendor and oem data
  UPSTREAM: sched/core: Mitigate race cpus_share_cache()/update_top_cache_domain()
  ANDROID: Update symbol list for mtk
  UPSTREAM: erofs: fix unsafe pagevec reuse of hooked pclusters
  UPSTREAM: erofs: remove the occupied parameter from z_erofs_pagevec_enqueue()
  UPSTREAM: usb: dwc3: gadget: Fix null pointer exception
  ANDROID: fips140: support "evaluation testing" builds via build.sh
  FROMGIT: sched/scs: Reset task stack state in bringup_cpu()
  ANDROID: dma-buf: heaps: fix dma-buf heap pool pages stat
  ANDROID: ABI: Add several spi_mem related symbols
  UPSTREAM: spi: spi-mem: add spi_mem_dtr_supports_op()
  ANDROID: gki_defconfig: enable CONFIG_SPI_MEM
  ANDROID: ABI: Add several iio related symbols
  ANDROID: ABI: Update symbol list for IMX
  ...

Change-Id: I09cddc92fa34553b944e62cc5cbbba94a84e5437

Conflicts:
	arch/arm/boot/dts/rk322x.dtsi
	arch/arm64/boot/dts/rockchip/rk3399.dtsi
	drivers/dma-buf/heaps/system_heap.c
	drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c
	drivers/gpu/drm/rockchip/rockchip_drm_vop.c
	drivers/gpu/drm/rockchip/rockchip_lvds.c
	drivers/gpu/drm/rockchip/rockchip_vop_reg.c
	drivers/mtd/nand/spi/core.c
	drivers/pci/controller/pcie-rockchip-host.c
	drivers/soc/rockchip/Kconfig
	drivers/usb/dwc3/core.c
	drivers/usb/dwc3/core.h
2021-12-14 17:09:02 +08:00
..
vdso arm64: vdso: Avoid ISB after reading from cntvct_el0 2021-08-12 13:22:17 +02:00
xen xen/arm: do not setup the runstate info page if kpti is enabled 2020-10-04 18:41:33 -05:00
acenv.h
acpi.h arm64/acpi: disallow AML memory opregions to access kernel memory 2020-07-14 18:02:03 +01:00
alternative-macros.h ANDROID: arm64: only permit certain alternatives in the FIPS140 module 2021-06-11 07:49:57 +00:00
alternative.h arm64: alternatives: Move length validation in alternative_{insn, endif} 2021-04-21 13:00:55 +02:00
arch_gicv3.h irqchip/gic-v3: Support pseudo-NMIs when SCR_EL3.FIQ == 0 2020-09-13 17:52:04 +01:00
arch_timer.h arm64: vdso: Avoid ISB after reading from cntvct_el0 2021-08-12 13:22:17 +02:00
archrandom.h arm64: random: Remove no longer needed prototypes 2020-10-07 14:17:20 +01:00
arm_dsu_pmu.h
arm-cci.h
asm_pointer_auth.h BACKPORT: arm64: pac: Optimize kernel entry/exit key installation code paths 2021-07-14 20:52:05 -07:00
asm-bug.h
asm-offsets.h
asm-prototypes.h
asm-uaccess.h This is the 5.10.50 stable release 2021-07-14 17:35:23 +02:00
assembler.h BACKPORT: arm64: fpsimd: run kernel mode NEON with softirqs disabled 2021-05-13 07:53:33 +00:00
atomic_ll_sc.h arm64: Move the LSE gas support detection to Kconfig 2020-01-15 12:50:48 +00:00
atomic_lse.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
atomic.h arm64: make atomic helpers __always_inline 2021-01-27 11:55:00 +01:00
barrier.h arm64: vdso: Avoid ISB after reading from cntvct_el0 2021-08-12 13:22:17 +02:00
bitops.h
bitrev.h
boot.h arm64: get rid of TEXT_OFFSET 2020-09-07 15:00:52 +01:00
brk-imm.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bug.h
cache.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
cacheflush.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
checksum.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
clocksource.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
cmpxchg.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
compat.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
compiler.h arm64: use a common .arch preamble for inline assembly 2020-08-28 11:15:15 +01:00
cpu_ops.h arm64: fix some spelling mistakes in the comments by codespell 2020-09-07 14:18:50 +01:00
cpu.h FROMLIST: arm64: cpuinfo: Split AArch32 registers out into a separate struct 2021-02-05 09:20:52 +00:00
cpucaps.h ANDROID: GKI: arm64: reserve space in cpu_hwcaps and cpu_hwcap_keys arrays 2021-04-23 18:42:37 -07:00
cpufeature.h FROMGIT: KVM: arm64: Drop the CPU_FTR_REG_HYP_COPY infrastructure 2021-03-31 08:23:28 +00:00
cpuidle.h
cputype.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
current.h
daifflags.h arm64: entry: always set GIC_PRIO_PSR_I_SET during entry 2021-05-19 10:13:07 +02:00
dcc.h
debug-monitors.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
device.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dmi.h
efi.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
el2_setup.h FROMLIST: arm64: kvm: Enable access to TRBE support for host 2021-03-01 12:52:14 -08:00
elf.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
esr.h UPSTREAM: arm64: mte: add in-kernel MTE helpers 2021-01-19 21:47:29 -08:00
exception.h BACKPORT: arm64: expose FAR_EL1 tag bits in siginfo 2021-01-22 10:09:05 -08:00
exec.h
extable.h arm64: Improve diagnostics when trapping BRK with FAULT_BRK_IMM 2020-09-18 16:35:54 +01:00
fb.h
fixmap.h arm64/fixmap: make notes of fixed_addresses more precisely 2020-08-08 19:25:04 +01:00
fpsimd.h FROMGIT: arm64: sve: Provide a conditional update accessor for ZCR_ELx 2021-03-19 08:20:11 +00:00
fpsimdmacros.h BACKPORT: FROMGIT: KVM: arm64: Rework SVE host-save/guest-restore 2021-03-19 08:20:43 +00:00
ftrace.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
futex.h BACKPORT: arm64: uaccess: rename privileged uaccess routines 2021-04-23 17:52:37 +02:00
hardirq.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
hugetlb.h arm64/hugetlb: Reserve CMA areas for gigantic pages on 16K and 64K configs 2020-07-15 13:38:03 +01:00
hw_breakpoint.h
hwcap.h Merge branch 'for-next/mte' into for-next/core 2020-10-02 12:16:11 +01:00
hyp_image.h FROMLIST: KVM: arm64: Allow using kvm_nvhe_sym() in hyp code 2021-03-17 18:48:49 +00:00
hypervisor.h
image.h
insn.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
io.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
irq_work.h FROMGIT: arm64: Kill __smp_cross_call and co 2020-10-01 11:07:44 -07:00
irq.h
irqflags.h arm64: Implement arch_irqs_disabled() 2020-08-26 12:41:55 +02:00
jump_label.h
kasan.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kbuild local64.h: make <asm/local64.h> mandatory 2021-01-12 20:18:16 +01:00
kernel-pgtable.h arm64: consistently use reserved_pg_dir 2021-07-14 16:56:06 +02:00
kexec.h Revert "arm64: kexec: make dtb_mem always enabled" 2020-01-10 16:00:50 +00:00
kfence.h FROMGIT: kfence: use pt_regs to generate stack trace on faults 2021-02-05 09:20:53 -08:00
kgdb.h
kprobes.h arm64: kprobes: Use BRK instead of single-step when executing instructions out-of-line 2020-11-03 14:03:38 +00:00
kvm_arm.h KVM: arm64: Disable guest access to trace filter controls 2021-04-16 11:43:19 +02:00
kvm_asm.h FROMLIST: KVM: arm64: Protect the .hyp sections from the host 2021-03-17 18:48:52 +00:00
kvm_emulate.h Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
kvm_host.h BACKPORT: arm64: KVM: Enable access to TRBE support for host 2021-06-23 22:47:56 +00:00
kvm_hyp.h FROMGIT: KVM: arm64: Drop the CPU_FTR_REG_HYP_COPY infrastructure 2021-03-31 08:23:28 +00:00
kvm_mmu.h FROMLIST: KVM: arm64: Refactor __load_guest_stage2() 2021-03-17 18:48:50 +00:00
kvm_pgtable.h ANDROID: KVM: arm64: Sync with upstream host stage 2 series 2021-03-31 08:23:11 +00:00
kvm_ptrauth.h KVM: arm64: Update context references from host to hyp 2020-09-15 18:39:02 +01:00
kvm_ras.h
kvm_types.h KVM: arm64: Use common KVM implementation of MMU memory caches 2020-07-09 13:29:43 -04:00
linkage.h arm64: Don't insert a BTI instruction at inner labels 2020-06-24 14:24:29 +01:00
lse.h ANDROID: arm64: disable LSE when building the FIPS140 module 2021-07-13 21:37:35 +00:00
memory.h UPSTREAM: arm64: kasan: mte: use a constant kernel GCR_EL1 value 2021-10-01 09:39:35 -07:00
mman.h arm64: mte: Validate the PROT_MTE request via arch_validate_flags() 2020-09-04 12:46:07 +01:00
mmu_context.h This is the 5.10.50 stable release 2021-07-14 17:35:23 +02:00
mmu.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mmzone.h
module.h ANDROID: arm64: module: add RELA metadata for FIPS140 use 2021-05-07 07:12:43 -07:00
module.lds.h ANDROID: crypto: fips140 - perform load time integrity check 2021-06-11 07:49:58 +00:00
mte-def.h FROMGIT: arm64: kasan: simplify and inline MTE functions 2021-02-16 15:33:32 +01:00
mte-kasan.h UPSTREAM: arm64: kasan: mte: use a constant kernel GCR_EL1 value 2021-10-01 09:39:35 -07:00
mte.h UPSTREAM: arm64: add MTE supported check to thread switching and syscall entry/exit 2021-10-01 09:39:36 -07:00
neon-intrinsics.h
neon.h
numa.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
page-def.h arm64/mm: Unify CONT_PTE_SHIFT 2020-09-11 16:33:43 +01:00
page.h BACKPORT: FROMGIT: arm64: mte: handle tags zeroing at page allocation time 2021-06-17 14:39:37 -07:00
paravirt.h
pci.h arm64: Enable PCI write-combine resources under sysfs 2020-09-18 14:05:13 +01:00
percpu.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
perf_event.h arm64: perf: Add support caps under sysfs 2020-09-28 14:53:45 +01:00
pgalloc.h asm-generic: pgalloc: provide generic pgd_free() 2020-08-07 11:33:26 -07:00
pgtable-hwdef.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
pgtable-prot.h FROMLIST: KVM: arm64: Introduce KVM_PGTABLE_S2_NOFWB Stage-2 flag 2021-03-17 18:48:52 +00:00
pgtable-types.h arm64: add support for folded p4d page tables 2020-06-04 19:06:21 -07:00
pgtable.h This is the 5.10.50 stable release 2021-07-14 17:35:23 +02:00
pointer_auth.h FROMLIST: arm64: move preemption disablement to prctl handlers 2021-07-14 20:52:05 -07:00
preempt.h sched/core: Initialize the idle task with preemption disabled 2021-07-14 16:55:50 +02:00
probes.h arm64/fpsimd: add <asm/insn.h> to <asm/kprobes.h> to fix fpsimd build 2020-11-23 10:59:00 +00:00
proc-fns.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
processor.h FROMLIST: arm64: move preemption disablement to prctl handlers 2021-07-14 20:52:05 -07:00
ptdump.h arm64: mm: convert mm/dump.c to use walk_page_range() 2020-02-04 03:05:25 +00:00
ptrace.h This is the 5.10.58 stable release 2021-08-12 14:58:34 +02:00
pvclock-abi.h
rwonce.h UPSTREAM: arm64: lto: Strengthen READ_ONCE() to acquire when CONFIG_LTO=y 2021-01-29 08:41:03 +00:00
scs.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sdei.h
seccomp.h UPSTREAM: arm64: Enable seccomp architecture tracking 2020-12-21 18:47:22 +00:00
sections.h FROMLIST: KVM: arm64: Introduce a BSS section for use at Hyp 2021-03-17 18:48:48 +00:00
setup.h FROMGIT: arm64: Extract early FDT mapping from kaslr_early_init() 2021-02-12 15:27:46 +00:00
shmparam.h
signal.h BACKPORT: arm64: expose FAR_EL1 tag bits in siginfo 2021-01-22 10:09:05 -08:00
signal32.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
simd.h ANDROID: arm64: simd: omit capability check in may_use_simd() 2021-06-11 07:49:58 +00:00
smp_plat.h
smp.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sparsemem.h FROMLIST: arm64: reduce section size for sparsemem 2021-01-12 21:55:15 +00:00
spectre.h UPSTREAM: arm64: Make the Meltdown mitigation state available 2021-01-28 17:57:10 +00:00
spinlock_types.h
spinlock.h arm64/spinlock: fix a -Wunused-function warning 2020-02-10 11:29:24 +00:00
stack_pointer.h
stackprotector.h FROMGIT: arm64: Defer enabling pointer authentication on boot core 2021-02-12 15:27:47 +00:00
stacktrace.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
stage2_pgtable.h KVM: arm64: Remove unused page-table code 2020-09-11 15:51:15 +01:00
stat.h
string.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
suspend.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sync_bitops.h
syscall_wrapper.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
syscall.h arm64: fix compat syscall return truncation 2021-08-12 13:22:20 +02:00
sysreg.h UPSTREAM: arm64: kasan: mte: use a constant kernel GCR_EL1 value 2021-10-01 09:39:35 -07:00
system_info.h
system_misc.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
thread_info.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
timex.h
tlb.h arm64: tlb: fix the TTL value of tlb_get_level 2021-07-19 09:44:59 +02:00
tlbflush.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
topology.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
traps.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
uaccess.h This is the 5.10.50 stable release 2021-07-14 17:35:23 +02:00
unistd.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
unistd32.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
uprobes.h
vdso.h rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vermagic.h arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h> 2020-04-23 10:50:26 +09:00
virt.h FROMGIT: arm64: Provide an 'upgrade to VHE' stub hypercall 2021-02-12 15:27:45 +00:00
vmalloc.h
vmap_stack.h mm: reorder includes after introduction of linux/pgtable.h 2020-06-09 09:39:13 -07:00
word-at-a-time.h FROMGIT: arm64: mte: Enable TCO in functions that can read beyond buffer limits 2021-04-26 18:40:43 +02:00
xor.h