github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 22:14:04 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph
b7d5398aee
linux/fs
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
..
9p This is the 5.10.63 stable release 2021-09-08 09:08:09 +02:00
adfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
affs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
afs This is the 5.10.54 stable release 2021-07-28 15:23:47 +02:00
autofs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
befs [PATCH] reduce boilerplate in fsid handling 2020-09-18 16:45:50 -04:00
bfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
btrfs This is the 5.10.62 stable release 2021-09-03 10:51:56 +02:00
cachefiles fs/cachefiles: Remove wait_bit_key layout dependency 2021-03-30 14:32:07 +02:00
ceph This is the 5.10.63 stable release 2021-09-08 09:08:09 +02:00
cifs This is the 5.10.65 stable release 2021-09-15 14:16:47 +02:00
coda rk: revert to v4.19 2021-03-17 18:05:39 +08:00
configfs This is the 5.10.50 stable release 2021-07-14 17:35:23 +02:00
cramfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
crypto This is the 5.10.63 stable release 2021-09-08 09:08:09 +02:00
debugfs debugfs: Return error during {full/open}_proxy_open() on rmmod 2021-09-15 09:50:37 +02:00
devpts rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dlm fs: dlm: fix memory leak when fenced 2021-07-14 16:55:59 +02:00
ecryptfs Merge 5.10.40 into android12-5.10 2021-05-27 08:36:46 +02:00
efivarfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
efs [PATCH] reduce boilerplate in fsid handling 2020-09-18 16:45:50 -04:00
erofs UPSTREAM: erofs: fix deadlock when shrink erofs slab 2021-12-01 17:46:54 +00:00
exfat exfat: handle wrong stream entry size in exfat_readdir() 2021-07-14 16:56:52 +02:00
exportfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ext2 rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ext4 This is the 5.10.63 stable release 2021-09-08 09:08:09 +02:00
f2fs Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
fat rk: revert to v4.19 2021-03-17 18:05:39 +08:00
freevxfs
fscache rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fuse Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
gfs2 This is the 5.10.65 stable release 2021-09-15 14:16:47 +02:00
hfs This is the 5.10.55 stable release 2021-07-31 08:51:04 +02:00
hfsplus Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
hostfs hostfs: fix memory handling in follow_link() 2021-04-14 08:42:06 +02:00
hpfs [PATCH] reduce boilerplate in fsid handling 2020-09-18 16:45:50 -04:00
hugetlbfs hugetlbfs: fix mount mode command line processing 2021-07-28 14:35:46 +02:00
incfs ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure 2021-11-02 09:01:06 +00:00
iomap This is the 5.10.65 stable release 2021-09-15 14:16:47 +02:00
isofs isofs: joliet: Fix iocharset=utf8 mount option 2021-09-15 09:50:25 +02:00
jbd2 ext4: fix debug format string warning 2021-05-19 10:13:19 +02:00
jffs2 Merge 5.10.36 into android12-5.10 2021-05-13 14:22:11 +02:00
jfs This is the 5.10.52 stable release 2021-07-20 16:36:53 +02:00
kernfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
lockd lockd: Fix invalid lockowner cast after vfs_test_lock 2021-09-15 09:50:41 +02:00
minix rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nfs This is the 5.10.63 stable release 2021-09-08 09:08:09 +02:00
nfs_common rk: revert to v4.19 2021-03-17 18:05:39 +08:00
nfsd nfsd4: Fix forced-expiry locking 2021-09-15 09:50:41 +02:00
nilfs2 nilfs2: fix memory leak in nilfs_sysfs_delete_device_group 2021-06-30 08:47:24 -04:00
nls
notify This is the 5.10.46 stable release 2021-06-23 17:53:08 +02:00
ntfs ntfs: fix validity check for file name attribute 2021-07-14 16:55:38 +02:00
ocfs2 This is the 5.10.56 stable release 2021-08-04 15:02:23 +02:00
omfs fs: omfs: use kmemdup() rather than kmalloc+memcpy 2020-09-22 23:39:45 -04:00
openpromfs
orangefs This is the 5.10.52 stable release 2021-07-20 16:36:53 +02:00
overlayfs This is the 5.10.63 stable release 2021-09-08 09:08:09 +02:00
proc Merge branch 'android12-5.10' into android12-5.10-lts 2021-07-30 13:34:01 +02:00
pstore Merge branch 'android12-5.10' into android12-5.10-lts 2021-07-22 13:32:27 +02:00
qnx4 [PATCH] reduce boilerplate in fsid handling 2020-09-18 16:45:50 -04:00
qnx6 [PATCH] reduce boilerplate in fsid handling 2020-09-18 16:45:50 -04:00
quota rk: revert to v4.19 2021-03-17 18:05:39 +08:00
ramfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
reiserfs This is the 5.10.58 stable release 2021-08-12 14:58:34 +02:00
romfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sdcardfs Revert "ANDROID: sdcardfs: remove sdcardfs from system" 2020-09-25 09:32:14 +08:00
squashfs Merge 5.10.38 into android12-5.10 2021-05-20 15:35:25 +02:00
sysfs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sysv rk: revert to v4.19 2021-03-17 18:05:39 +08:00
tracefs
ubifs Merge tag 'ASB-2021-12-05_12-5.10' of https://android.googlesource.com/kernel/common 2021-12-14 17:09:02 +08:00
udf udf_get_extendedattr() had no boundary checks. 2021-09-15 09:50:27 +02:00
ufs rk: revert to v4.19 2021-03-17 18:05:39 +08:00
unicode rk: revert to v4.19 2021-03-17 18:05:39 +08:00
vboxsf vboxsf: Add support for the atomic_open directory-inode op 2021-08-18 08:59:18 +02:00
verity UPSTREAM: fsverity: relax build time dependency on CRYPTO_SHA256 2021-05-13 07:53:32 +00:00
xfs Merge 5.10.37 into android12-5.10 2021-05-15 09:28:55 +02:00
zonefs zonefs: fix to update .i_wr_refcnt correctly in zonefs_open_zone() 2021-03-25 09:04:05 +01:00
aio.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
anon_inodes.c UPSTREAM: fs: anon_inodes: rephrase to appropriate kernel-doc 2021-03-03 16:18:33 +00:00
attr.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
bad_inode.c
binfmt_aout.c
binfmt_elf_fdpic.c binfmt_elf, binfmt_elf_fdpic: use a VMA list snapshot 2020-10-16 11:11:21 -07:00
binfmt_elf.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
binfmt_em86.c
binfmt_flat.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
binfmt_misc.c binfmt_misc: fix possible deadlock in bm_register_write 2021-03-17 17:06:35 +01:00
binfmt_script.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
block_dev.c Merge 5.10.42 into android12-5.10 2021-06-03 18:47:38 +02:00
buffer.c BACKPORT: UPSTREAM: mm: fs: invalidate bh_lrus for only cold path 2021-09-27 17:48:37 -07:00
char_dev.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
compat_binfmt_elf.c
coredump.c ANDROID: mm: page_pinner: use put_user_page at dump_user_range 2021-04-30 09:13:35 -07:00
d_path.c fs: fix NULL dereference due to data race in prepend_path() 2020-10-14 14:54:45 -07:00
dax.c dax: fix ENOMEM handling in grab_mapping_entry() 2021-07-14 16:56:13 +02:00
dcache.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
dcookies.c
direct-io.c Merge 5.10.30 into android12-5.10 2021-04-15 14:23:41 +02:00
drop_caches.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
eventfd.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
eventpoll.c Merge 5.10.36 into android12-5.10 2021-05-13 14:22:11 +02:00
exec.c Revert "Add a reference to ucounts for each cred" 2021-09-08 08:49:00 +02:00
fcntl.c fcntl: fix potential deadlock for &fasync_struct.fa_lock 2021-09-15 09:50:27 +02:00
fhandle.c
file_table.c task_work: cleanup notification modes 2020-10-17 15:05:30 -06:00
file.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
filesystems.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
fs_context.c
fs_parser.c fs_parse: mark fs_param_bad_value() as static 2020-10-13 18:38:27 -07:00
fs_pin.c
fs_struct.c
fs_types.c
fs-writeback.c writeback: fix obtain a reference to a freeing memcg css 2021-07-14 16:56:31 +02:00
fsopen.c
init.c
inode.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
internal.h cgroup1: fix leaked context root causing sporadic NULL deref in LTP 2021-07-31 08:16:11 +02:00
io_uring.c io_uring: IORING_OP_WRITE needs hash_reg_file set 2021-09-15 09:50:47 +02:00
io-wq.c io_uring: fix false WARN_ONCE 2021-07-19 09:44:51 +02:00
io-wq.h io_uring: always batch cancel in *cancel_files() 2021-02-13 13:54:56 +01:00
ioctl.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig rk: revert to v4.19 2021-03-17 18:05:39 +08:00
Kconfig.binfmt
kernel_read_file.c fs/kernel_file_read: Add "offset" arg for partial reads 2020-10-05 13:37:04 +02:00
libfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
locks.c Revert "nfsd4: a client's own opens needn't prevent delegations" 2021-03-20 10:43:44 +01:00
Makefile rk: revert to v4.19 2021-03-17 18:05:39 +08:00
mbcache.c
mount.h
mpage.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
namei.c Merge 5.10.30 into android12-5.10 2021-04-15 14:23:41 +02:00
namespace.c fs: warn about impending deprecation of mandatory locks 2021-08-26 08:35:57 -04:00
no-block.c
nsfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
open.c This is the 5.10.50 stable release 2021-07-14 17:35:23 +02:00
pipe.c Revert "pipe: avoid unnecessary EPOLLET wakeups under normal loads" 2021-09-06 14:28:23 +02:00
pnode.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
pnode.h mount: fix mounting of detached mounts onto targets that reside on shared mounts 2021-03-17 17:06:13 +01:00
posix_acl.c
proc_namespace.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
read_write.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
readdir.c readdir: make sure to verify directory entry for legacy interfaces too 2021-04-21 13:00:54 +02:00
remap_range.c vfs: move the remap range helpers to remap_range.c 2020-10-15 09:48:49 -07:00
select.c kernel, fs: Introduce and use set_restart_fn() and arch_set_restart_data() 2021-03-25 09:04:16 +01:00
seq_file.c seq_file: disallow extremely large seq buffer allocations 2021-07-20 16:05:59 +02:00
signalfd.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
splice.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
stack.c
stat.c fs: fix reporting supported extra file attributes for statx() 2021-05-11 14:47:33 +02:00
statfs.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
super.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
sync.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
timerfd.c ANDROID: fs: Add vendor hooks for ep_create_wakeup_source & timerfd_create 2021-03-24 17:57:22 +00:00
userfaultfd.c ANDROID: userfaultfd: Fix merge resolution: validate_range() 2021-10-26 21:43:22 +00:00
utimes.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00
xattr.c rk: revert to v4.19 2021-03-17 18:05:39 +08:00