qjyu
/
OrangePi_CM5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
OrangePi_CM5/kernel
History
Tao Huang 62ca347b51 Merge tag 'ASB-2022-05-05_12-5.10' of https://android.googlesource.com/kernel/common 
https://source.android.com/security/bulletin/2022-05-01
CVE-2022-0847
CVE-2022-20009
CVE-2022-20008
CVE-2021-22600

* tag 'ASB-2022-05-05_12-5.10': (116 commits)
  UPSTREAM: usb: dwc3: gadget: Replace list_for_each_entry_safe() if using giveback
  UPSTREAM: usb: dwc3: Issue core soft reset before enabling run/stop
  UPSTREAM: usb: dwc3: gadget: Wait for ep0 xfers to complete during dequeue
  ANDROID: Update QCOM symbol list for trace_map/unmap
  ANDROID: fix KCFLAGS override by __ANDROID_COMMON_KERNEL__
  ANDROID: vendor_hooks: tune reclaim scan type for specified mem_cgroup
  ANDROID: vendor_hooks: Add hooks for rwsem
  ANDROID: Add flag to indicate compiling against ACK
  ANDROID: GKI: build damon reclaim
  FROMLIST: mm/damon/reclaim: Fix the timer always stays active
  BACKPORT: treewide: Add missing includes masked by cgroup -> bpf dependency
  UPSTREAM: mm/damon: modify damon_rand() macro to static inline function
  UPSTREAM: mm/damon: add 'age' of region tracepoint support
  UPSTREAM: mm/damon: hide kernel pointer from tracepoint event
  UPSTREAM: mm/damon/vaddr: hide kernel pointer from damon_va_three_regions() failure log
  UPSTREAM: mm/damon/vaddr: use pr_debug() for damon_va_three_regions() failure logging
  UPSTREAM: mm/damon/dbgfs: remove an unnecessary variable
  UPSTREAM: mm/damon: move the implementation of damon_insert_region to damon.h
  UPSTREAM: mm/damon: add access checking for hugetlb pages
  UPSTREAM: mm/damon/dbgfs: support all DAMOS stats
  ...

Change-Id: I3498d4868ff86bec30e74dab9e541d787c2bd5ac

Conflicts:
	drivers/android/Kconfig
	drivers/usb/dwc3/gadget.c
 		2022-07-15 17:46:01 +08:00
..
bpf UPSTREAM: bpf: Add kconfig knob for disabling unpriv bpf by default 2022-03-14 14:42:39 +01:00
cgroup Merge branch 'android12-5.10' into `android12-5.10-lts` 2022-02-09 18:16:30 +01:00
configs
…
debug kgdb: fix to kill breakpoints on initmem after boot 2021-03-04 11:38:46 +01:00
dma UPSTREAM: dma-debug: fix debugfs initialization order 2022-03-28 19:01:23 +08:00
entry KVM: rseq: Update rseq when processing NOTIFY_RESUME on xfer to KVM guest 2021-10-06 15:55:49 +02:00
events This is the 5.10.101 stable release 2022-02-16 15:16:06 +01:00
gcov gcov: re-fix clang-11+ support 2021-04-14 08:41:58 +02:00
irq This is the 5.10.65 stable release 2021-09-15 14:16:47 +02:00
kcsan kcsan: Fix debugfs initcall return type 2021-05-26 12:06:54 +02:00
livepatch
…
locking ANDROID: vendor_hooks: Add hooks for rwsem 2022-04-29 16:57:10 +08:00
power This is the 5.10.101 stable release 2022-02-16 15:16:06 +01:00
printk Merge tag 'ASB-2022-04-05_12-5.10' of https://android.googlesource.com/kernel/common 2022-07-15 17:40:39 +08:00
rcu UPSTREAM: rcu/exp: Mark current CPU as exp-QS in IPI loop second pass 2022-02-15 17:19:24 +05:30
sched Merge tag 'ASB-2022-04-05_12-5.10' of https://android.googlesource.com/kernel/common 2022-07-15 17:40:39 +08:00
time BACKPORT: timers: implement usleep_idle_range() 2022-04-28 23:09:17 +08:00
trace Merge tag 'android12-5.10.101_r00' into android12-5.10 2022-03-21 14:29:02 +01:00
.gitignore kbuild: update config_data.gz only when the content of .config is changed 2021-05-11 14:47:37 +02:00
Kconfig.freezer
…
Kconfig.hz
…
Kconfig.locks
…
Kconfig.preempt
…
Makefile kbuild: update config_data.gz only when the content of .config is changed 2021-05-11 14:47:37 +02:00
acct.c
…
async.c
…
audit.c audit: improve audit queue handling when "audit=1" on cmdline 2022-02-08 18:30:34 +01:00
audit.h
…
audit_fsnotify.c fsnotify: generalize handle_inode_event() 2020-12-30 11:54:18 +01:00
audit_tree.c audit: move put_tree() to avoid trim_trees refcount underflow and UAF 2021-09-03 10:09:31 +02:00
audit_watch.c fsnotify: generalize handle_inode_event() 2020-12-30 11:54:18 +01:00
auditfilter.c
…
auditsc.c audit: fix possible null-pointer dereference in audit_filter_rules 2021-10-27 09:56:52 +02:00
backtracetest.c
…
bounds.c
…
capability.c
…
cfi.c ANDROID: cfi: explicitly clear diag in __cfi_slowpath 2021-09-02 08:55:56 +00:00
compat.c
…
configs.c
…
context_tracking.c
…
cpu.c Merge branch 'android12-5.10' into `android12-5.10-lts` 2022-02-09 18:16:30 +01:00
cpu_pm.c PM: cpu: Make notifier chain use a raw_spinlock_t 2021-09-15 09:50:40 +02:00
crash_core.c crash_core, vmcoreinfo: append 'SECTION_SIZE_BITS' to vmcoreinfo 2021-06-23 14:42:52 +02:00
crash_dump.c
…
cred.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
delayacct.c
…
dma.c
…
exec_domain.c
…
exit.c ANDROID: vendor_hooks: Add hooks for memory when debug 2021-03-19 04:54:07 +00:00
extable.c
…
fail_function.c
…
fork.c UPSTREAM: ANDROID: Configure out the macros in android_kabi and android_vendor 2022-04-11 08:50:12 +08:00
freezer.c ANDROID: freezer: Add vendor hook to freezer for GKI purpose. 2021-06-07 16:07:44 +00:00
futex.c ANDROID: vendor_hooks: Add hooks for futex 2021-12-20 04:23:00 +00:00
gen_kheaders.sh
…
groups.c
…
hung_task.c FROMLIST: freezer: Add frozen_or_skipped() helper function 2021-06-02 15:42:01 +00:00
iomem.c
…
irq_work.c
…
jump_label.c jump_label: Fix jump_label_text_reserved() vs __init 2021-07-20 16:05:58 +02:00
kallsyms.c ANDROID: kallsyms: cfi: strip hashes from static functions 2021-01-14 16:31:46 +00:00
kcmp.c exec: Transform exec_update_mutex into a rw_semaphore 2021-01-09 13:46:24 +01:00
kcov.c
…
kexec.c
…
kexec_core.c kernel: kexec: remove the lock operation of system_transition_mutex 2021-02-03 23:28:37 +01:00
kexec_elf.c
…
kexec_file.c kernel: kexec_file: fix error return code of kexec_calculate_store_digests() 2021-05-19 10:13:09 +02:00
kexec_internal.h
…
kheaders.c
…
kmod.c
…
kprobes.c kprobes: Limit max data_size of the kretprobe instances 2021-12-08 09:03:20 +01:00
ksysfs.c
…
kthread.c This is the 5.10.62 stable release 2021-09-03 10:51:56 +02:00
latencytop.c
…
module-internal.h
…
module.c Merge branch 'android12-5.10' into `android12-5.10-lts` 2021-07-22 13:32:27 +02:00
module_signature.c module: harden ELF info handling 2021-03-25 09:04:11 +01:00
module_signing.c module: harden ELF info handling 2021-03-25 09:04:11 +01:00
notifier.c
…
nsproxy.c
…
padata.c
…
panic.c
…
params.c
…
pid.c Merge 5.10.6 into android12-5.10 2021-01-13 10:28:55 +01:00
pid_namespace.c memcg: enable accounting for pids in nested pid namespaces 2021-09-18 13:40:36 +02:00
profile.c profiling: fix shift-out-of-bounds bugs 2021-09-26 14:08:58 +02:00
ptrace.c ptrace: make ptrace() fail if the tracee changed its pid unexpectedly 2021-05-26 12:06:49 +02:00
range.c
…
reboot.c i2c: rk3x: Make sure the i2c transfer to be finished before system reboot 2021-08-03 14:44:16 +08:00
regset.c
…
relay.c
…
resource.c kernel/resource: make walk_mem_res() find all busy IORESOURCE_MEM resources 2021-05-19 10:13:09 +02:00
rseq.c KVM: rseq: Update rseq when processing NOTIFY_RESUME on xfer to KVM guest 2021-10-06 15:55:49 +02:00
scftorture.c
…
scs.c FROMGIT: scs: Release kasan vmalloc poison in scs_free process 2021-10-04 15:44:53 +00:00
seccomp.c This is the 5.10.60 stable release 2021-08-27 17:14:51 +02:00
signal.c This is the 5.10.80 stable release 2021-11-19 11:50:41 +01:00
smp.c ANDROID: Fix kernelci warnings for indentation in smp.c 2021-07-06 21:17:01 +00:00
smpboot.c sched/core: Initialize the idle task with preemption disabled 2021-07-14 16:55:50 +02:00
smpboot.h
…
softirq.c softirq: retrieve wakeup_softirqd() 2021-09-06 16:18:59 +08:00
stackleak.c
…
stacktrace.c ANDROID: stacktrace: export stack_trace_save_tsk/regs 2021-04-13 13:18:04 +00:00
static_call.c static_call: Fix unused variable warn w/o MODULE 2021-09-08 08:49:00 +02:00
stop_machine.c
…
sys.c This is the 5.10.69 stable release 2021-09-30 18:36:17 +02:00
sys_ni.c UPSTREAM: mm: wire up syscall process_mrelease 2022-01-06 17:37:36 +00:00
sysctl-test.c
…
sysctl.c UPSTREAM: x86/speculation: Include unprivileged eBPF status in Spectre v2 mitigation reporting 2022-03-14 14:43:53 +01:00
task_work.c FROMGIT: kasan: record task_work_add() call stack 2021-03-24 15:09:18 -07:00
taskstats.c
…
test_kprobes.c
…
torture.c
…
tracepoint.c This is the 5.10.62 stable release 2021-09-03 10:51:56 +02:00
tsacct.c taskstats: Cleanup the use of task->exit_code 2022-01-27 10:54:33 +01:00
ucount.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
uid16.c
…
uid16.h
…
umh.c
…
up.c smp: Fix smp_call_function_single_async prototype 2021-05-14 09:50:46 +02:00
user-return-notifier.c
…
user.c Revert "ANDROID: user: Add vendor hook to user for GKI purpose" 2022-01-20 10:04:49 +01:00
user_namespace.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
usermode_driver.c bpf: Fix umd memory leak in copy_process() 2021-03-30 14:32:03 +02:00
utsname.c
…
utsname_sysctl.c
…
watch_queue.c
…
watchdog.c hardlockup: detect hard lockups without NMIs using secondary cpus 2022-05-12 15:11:15 +08:00
watchdog_hld.c
…
workqueue.c Merge branch 'android12-5.10' into `android12-5.10-lts` 2022-02-09 18:16:30 +01:00
workqueue_internal.h
…