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

Merge branch 'android13-5.10' into branch `android13-5.10-lts`



Catch up with a lot of patches and symbols to track that have been added
to the android13-5.10 branch.

This merge includes the following commits:

* 4b9563f5 BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* 5b863527 BACKPORT: ravb: Fix up dma_free_coherent() call in ravb_remove()
* 44714c92 ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
* 90988912 ANDROID: usb: gadget: fix cannot create multiple android instances
* 79083bee UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
* 339eb779 UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* eb0351cb UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 334c5696 FROMGIT: f2fs: do not return EFSCORRUPTED, but try to run online repair
* 26fe28f8 UPSTREAM: net/sched: Retire rsvp classifier
* d35d8fbd UPSTREAM: netfilter: xt_u32: validate user space input
* a7f4171c UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* 1d8dd603 UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* e1020a2a UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
* a2070840 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
* b00726e0 UPSTREAM: netfilter: nf_tables: report use refcount overflow
* e99dd1ff UPSTREAM: drm/edid: check for HF-SCDB block
* d677c31c UPSTREAM: usb: gadget: u_serial: Add null pointer check in gs_start_io
* b6940bcb Merge tag 'android13-5.10.189_r00' into android13-5.10
* 5f70956c UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
* fc9bac25 ANDROID: Update the ABI symbol list
* 8de53d7b ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup
* a3c4adc7 UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
* 75f82c6a ANDROID: tools/resolve_btfids: Pass CFLAGS to libsubcmd build via EXTRA_CFLAGS
* 41755e2a ANDROID: libsubcmd: Hoist iterator variable declarations in parse_options_subcommand()
* 57aa73c6 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
* 8882e799 UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
* 61372c80 UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
* 83cfe9e4 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
* 69041f27 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
* 4e1f5720 ANDROID: GKI: prevent removal of monitored symbols
* 394c87e1 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* b96ddb60 UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
* 6140a0c7 ANDROID: cgroup: Fix bad merge of "Fix threadgroup_rwsem <-> cpus_read_lock() deadlock"
* 7a7749b8 ANDROID: fuse-bpf: Align data structs for 32-bit kernels
* e9023ea8 ANDROID: fuse-bpf: Get correct inode in mkdir
* 77838352 ANDROID: arm64: dts: qcom: sdm845-db845c: Do not point MDSS to the boot splash memory region
* 26e9bf8c BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local
* 15e225c2 UPSTREAM: f2fs: skip GC if possible when checkpoint disabling
* 925c0346 BACKPORT: iommu: Extend mutex lock scope in iommu_probe_device()
* e72e8f8a BACKPORT: iommu: Fix race condition during default domain allocation
* b5c1ca09 UPSTREAM: exfat: check if filename entries exceeds max filename length
* e2203f11 BACKPORT: FROMGIT: netfilter: nfnetlink_log: always add a timestamp
* 98700ea4 FROMGIT: arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved
* c442868b UPSTREAM: cpuidle: Add cpu_idle_miss trace event
* 096e6c86 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* 9b41adb7 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* acd58d9d UPSTREAM: usb: typec: tcpm: Fix altmode re-registration causes sysfs create fail
* 5d2dc3de ANDROID: GKI: rockchip: Add symbols for some usb wifi.
* ffc660c6 UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* 96445e82 UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* 6c1b083d UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
* 3c1153fe UPSTREAM: usb: dwc3: gadget: Replace list_for_each_entry_safe() if using giveback
* 9a801eff UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* 828ede37 UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* 299ae06a UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* fac82513 UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* c6929489 ANDROID: GKI: rockchip: Add symbols for clk.
* 84766282 ANDROID: GKI: asr: add symbols for asr-drm
* abbcfd3c UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
* a759d58f FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible
* 9b46410e BACKPORT: mm: skip CMA pages when they are not available
* f687669a FROMGIT: fs: drop_caches: draining pages before dropping caches
* 9fd93002 UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
* a4fd973a UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* 98809799 UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
* 5faa18d3 BACKPORT: USB: Gadget: core: Help prevent panic during UVC unconfigure
* 7efa0981 ANDROID: Update the ABI representation
* d2429181 ANDROID: cpuidle: teo: Export a function that allows modifying util_threshold
* f1ba3845 ANDROID: fuse-bpf: Use stored bpf for create_open
* 44df0b00 ANDROID: fuse-bpf: Add bpf to negative fuse_dentry
* 9859126a ANDROID: fuse-bpf: Check inode not null
* 62b2cf38 ANDROID: fuse-bpf: Fix flock test compile error
* cbd4c981 ANDROID: fuse-bpf: Add partial ioctl support
* 914d854f ANDROID: fuse-bpf: Add partial flock support
* d6ca4cd3 FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around()
* df2ac088 FROMGIT: BACKPORT: Multi-gen LRU: Avoid race in inc_min_seq()
* 61d78411 FROMGIT: BACKPORT: Multi-gen LRU: Fix per-zone reclaim
* ac2be105 ANDROID: GKI: rockchip: Add symbols for uac and uvc
* 0f1298b5 UPSTREAM: ata: libata-scsi: Avoid deadlock on rescan after device resume
* a6cbc280 UPSTREAM: USB: dwc3: fix use-after-free on core driver unbind
* c4bf56c0 UPSTREAM: KVM: arm64: Populate fault info for watchpoint
* fa2fae46 UPSTREAM: dt-bindings: usb: snps,dwc3: Fix "snps,hsphy_interface" type
* 7458373a UPSTREAM: xhci: Fix incorrect tracking of free space on transfer rings
* f91c04d3 UPSTREAM: firmware: arm_ffa: Set reserved/MBZ fields to zero in the memory descriptors
* 86bda109 UPSTREAM: firmware: arm_ffa: Fix FFA device names for logical partitions
* 12a8bcad BACKPORT: firmware: arm_ffa: Check if ffa_driver remove is present before executing
* f18a4e56 UPSTREAM: scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend
* f4cf9311 UPSTREAM: swiotlb: relocate PageHighMem test away from rmem_swiotlb_setup

Change-Id: I6f06531d85a04b5c9f5ff49b092bbc8a3981c993
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents 47abbdec 4b9563f5
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment