Google Git
Sign in
android / kernel / common / d30b996835c08018a70dd52c588ba15de1c8378b
commitd30b996835c08018a70dd52c588ba15de1c8378b[log] [tgz]
authorGreg Kroah-Hartman <gregkh@google.com>Tue Oct 31 14:33:10 2023 +0000
committerGreg Kroah-Hartman <gregkh@google.com>Tue Oct 31 14:34:10 2023 +0000
treec5eea7541e0b6b8f4dc7273992324d54f6db31ef
parent47abbdeca36fe5a0fb062c1d675cab8e7fcbf1cc [diff]
parent4b9563f5927b5ac4201edf590f61af5494c83943 [diff]
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:

* 4b9563f5927b BACKPORT: ravb: Fix use-after-free issue in ravb_tx_timeout_work()
* 5b8635270a57 BACKPORT: ravb: Fix up dma_free_coherent() call in ravb_remove()
* 44714c920d03 ANDROID: fuse-bpf: Add NULL pointer check in fuse_entry_revalidate
* 90988912a191 ANDROID: usb: gadget: fix cannot create multiple android instances
* 79083beef4e0 UPSTREAM: netfilter: ipset: Fix race between IPSET_CMD_CREATE and IPSET_CMD_SWAP
* 339eb7793394 UPSTREAM: net: xfrm: Fix xfrm_address_filter OOB read
* eb0351cb1806 UPSTREAM: igb: set max size RX buffer when store bad packet is enabled
* 334c5696a48f FROMGIT: f2fs: do not return EFSCORRUPTED, but try to run online repair
* 26fe28f84222 UPSTREAM: net/sched: Retire rsvp classifier
* d35d8fbdea9e UPSTREAM: netfilter: xt_u32: validate user space input
* a7f4171c07ee UPSTREAM: netfilter: nfnetlink_osf: avoid OOB read
* 1d8dd603291f UPSTREAM: netfilter: xt_sctp: validate the flag_info count
* e1020a2af01d UPSTREAM: ipv4: fix null-deref in ipv4_link_failure
* a2070840fa45 UPSTREAM: netfilter: nf_tables: disallow rule removal from chain binding
* b00726e00427 UPSTREAM: netfilter: nf_tables: report use refcount overflow
* e99dd1ff06e4 UPSTREAM: drm/edid: check for HF-SCDB block
* d677c31cb00a UPSTREAM: usb: gadget: u_serial: Add null pointer check in gs_start_io
* b6940bcb7cca Merge tag 'android13-5.10.189_r00' into android13-5.10
* 5f70956c6efe UPSTREAM: net/sched: sch_hfsc: Ensure inner classes have fsc curve
* fc9bac25b13e ANDROID: Update the ABI symbol list
* 8de53d7b6928 ANDROID: sched: Add EXPORT_SYMBOL_GPL for sched_wakeup
* a3c4adc78c20 UPSTREAM: net: sched: sch_qfq: Fix UAF in qfq_dequeue()
* 75f82c6a15c4 ANDROID: tools/resolve_btfids: Pass CFLAGS to libsubcmd build via EXTRA_CFLAGS
* 41755e2ac8e4 ANDROID: libsubcmd: Hoist iterator variable declarations in parse_options_subcommand()
* 57aa73c665a9 UPSTREAM: tcpm: Avoid soft reset when partner does not support get_status
* 8882e799467e UPSTREAM: tty: n_gsm: fix the UAF caused by race condition in gsm_cleanup_mux
* 61372c80187e UPSTREAM: netfilter: nf_tables: prevent OOB access in nft_byteorder_eval
* 83cfe9e47538 ANDROID: KVM: arm64: Don't update IOMMUs for share/unshare
* 69041f273667 UPSTREAM: af_unix: Fix null-ptr-deref in unix_stream_sendpage().
* 4e1f5720b5ed ANDROID: GKI: prevent removal of monitored symbols
* 394c87e14878 UPSTREAM: net/sched: sch_qfq: account for stab overhead in qfq_enqueue
* b96ddb603ff6 UPSTREAM: net/sched: sch_qfq: refactor parsing of netlink parameters
* 6140a0c7d7d9 ANDROID: cgroup: Fix bad merge of "Fix threadgroup_rwsem <-> cpus_read_lock() deadlock"
* 7a7749b840c1 ANDROID: fuse-bpf: Align data structs for 32-bit kernels
* e9023ea80662 ANDROID: fuse-bpf: Get correct inode in mkdir
* 778383524344 ANDROID: arm64: dts: qcom: sdm845-db845c: Do not point MDSS to the boot splash memory region
* 26e9bf8c90bd BACKPORT: net: nfc: Fix use-after-free caused by nfc_llcp_find_local
* 15e225c207c8 UPSTREAM: f2fs: skip GC if possible when checkpoint disabling
* 925c03465e83 BACKPORT: iommu: Extend mutex lock scope in iommu_probe_device()
* e72e8f8acf1e BACKPORT: iommu: Fix race condition during default domain allocation
* b5c1ca09d21f UPSTREAM: exfat: check if filename entries exceeds max filename length
* e2203f117399 BACKPORT: FROMGIT: netfilter: nfnetlink_log: always add a timestamp
* 98700ea4bc88 FROMGIT: arm64: dts: qcom: sdm845-db845c: Mark cont splash memory region as reserved
* c442868bc336 UPSTREAM: cpuidle: Add cpu_idle_miss trace event
* 096e6c86b616 UPSTREAM: media: usb: siano: Fix warning due to null work_func_t function pointer
* 9b41adb78a45 UPSTREAM: Bluetooth: L2CAP: Fix use-after-free in l2cap_sock_ready_cb
* acd58d9d64af UPSTREAM: usb: typec: tcpm: Fix altmode re-registration causes sysfs create fail
* 5d2dc3de02f3 ANDROID: GKI: rockchip: Add symbols for some usb wifi.
* ffc660c662ad UPSTREAM: net: tap_open(): set sk_uid from current_fsuid()
* 96445e821b1b UPSTREAM: net: tun_chr_open(): set sk_uid from current_fsuid()
* 6c1b083d9d34 UPSTREAM: usb: typec: tcpm: Fix response to vsafe0V event
* 3c1153fe9075 UPSTREAM: usb: dwc3: gadget: Replace list_for_each_entry_safe() if using giveback
* 9a801eff0f5a UPSTREAM: netfilter: nf_tables: disallow rule addition to bound chain via NFTA_RULE_CHAIN_ID
* 828ede379ffc UPSTREAM: net/sched: cls_route: No longer copy tcf_result on update to avoid use-after-free
* 299ae06a36bf UPSTREAM: net/sched: cls_fw: No longer copy tcf_result on update to avoid use-after-free
* fac82513c489 UPSTREAM: net/sched: cls_u32: No longer copy tcf_result on update to avoid use-after-free
* c69294897c58 ANDROID: GKI: rockchip: Add symbols for clk.
* 84766282df88 ANDROID: GKI: asr: add symbols for asr-drm
* abbcfd3c10d8 UPSTREAM: tty: n_gsm: fix UAF in gsm_cleanup_mux
* a759d58f447b FROMGIT: Multi-gen LRU: skip CMA pages when they are not eligible
* 9b46410e61c2 BACKPORT: mm: skip CMA pages when they are not available
* f687669a2167 FROMGIT: fs: drop_caches: draining pages before dropping caches
* 9fd9300282f9 UPSTREAM: netfilter: nf_tables: skip bound chain on rule flush
* a4fd973abf2b UPSTREAM: net/sched: cls_fw: Fix improper refcount update leads to use-after-free
* 988097995b4d UPSTREAM: netfilter: nft_set_pipapo: fix improper element removal
* 5faa18d3d347 BACKPORT: USB: Gadget: core: Help prevent panic during UVC unconfigure
* 7efa0981b53b ANDROID: Update the ABI representation
* d2429181c3a7 ANDROID: cpuidle: teo: Export a function that allows modifying util_threshold
* f1ba38450822 ANDROID: fuse-bpf: Use stored bpf for create_open
* 44df0b00ba90 ANDROID: fuse-bpf: Add bpf to negative fuse_dentry
* 9859126ade40 ANDROID: fuse-bpf: Check inode not null
* 62b2cf383d43 ANDROID: fuse-bpf: Fix flock test compile error
* cbd4c981f298 ANDROID: fuse-bpf: Add partial ioctl support
* 914d854f8575 ANDROID: fuse-bpf: Add partial flock support
* d6ca4cd3755f FROMGIT: BACKPORT: Multi-gen LRU: Fix can_swap in lru_gen_look_around()
* df2ac088e3a6 FROMGIT: BACKPORT: Multi-gen LRU: Avoid race in inc_min_seq()
* 61d7841115e8 FROMGIT: BACKPORT: Multi-gen LRU: Fix per-zone reclaim
* ac2be105c3b9 ANDROID: GKI: rockchip: Add symbols for uac and uvc
* 0f1298b51310 UPSTREAM: ata: libata-scsi: Avoid deadlock on rescan after device resume
* a6cbc2808e31 UPSTREAM: USB: dwc3: fix use-after-free on core driver unbind
* c4bf56c020e4 UPSTREAM: KVM: arm64: Populate fault info for watchpoint
* fa2fae4624a7 UPSTREAM: dt-bindings: usb: snps,dwc3: Fix "snps,hsphy_interface" type
* 7458373aa494 UPSTREAM: xhci: Fix incorrect tracking of free space on transfer rings
* f91c04d39ffe UPSTREAM: firmware: arm_ffa: Set reserved/MBZ fields to zero in the memory descriptors
* 86bda1092351 UPSTREAM: firmware: arm_ffa: Fix FFA device names for logical partitions
* 12a8bcad461e BACKPORT: firmware: arm_ffa: Check if ffa_driver remove is present before executing
* f18a4e56bfaf UPSTREAM: scsi: ufs: core: Fix I/O hang that occurs when BKOPS fails in W-LUN suspend
* f4cf931152be UPSTREAM: swiotlb: relocate PageHighMem test away from rmem_swiotlb_setup

Change-Id: I6f06531d85a04b5c9f5ff49b092bbc8a3981c993
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
tree: c5eea7541e0b6b8f4dc7273992324d54f6db31ef
  1. android/
  2. arch/
  3. block/
  4. certs/
  5. crypto/
  6. Documentation/
  7. drivers/
  8. fs/
  9. include/
  10. init/
  11. io_uring/
  12. ipc/
  13. kernel/
  14. lib/
  15. LICENSES/
  16. mm/
  17. net/
  18. samples/
  19. scripts/
  20. security/
  21. sound/
  22. tools/
  23. usr/
  24. virt/
  25. .clang-format
  26. .cocciconfig
  27. .get_maintainer.ignore
  28. .gitattributes
  29. .gitignore
  30. .mailmap
  31. BUILD.bazel
  32. build.config.aarch64
  33. build.config.allmodconfig
  34. build.config.allmodconfig.aarch64
  35. build.config.allmodconfig.arm
  36. build.config.allmodconfig.x86_64
  37. build.config.amlogic
  38. build.config.arm
  39. build.config.common
  40. build.config.constants
  41. build.config.db845c
  42. build.config.gki
  43. build.config.gki-debug.aarch64
  44. build.config.gki-debug.x86_64
  45. build.config.gki.aarch64
  46. build.config.gki.aarch64.fips140
  47. build.config.gki.x86_64
  48. build.config.gki_kasan
  49. build.config.gki_kasan.aarch64
  50. build.config.gki_kasan.x86_64
  51. build.config.gki_kprobes
  52. build.config.gki_kprobes.aarch64
  53. build.config.gki_kprobes.x86_64
  54. build.config.hikey960
  55. build.config.khwasan
  56. build.config.rockchip
  57. build.config.rockpi4
  58. build.config.x86_64
  59. COPYING
  60. CREDITS
  61. Kbuild
  62. Kconfig
  63. MAINTAINERS
  64. Makefile
  65. OWNERS
  66. README
  67. README.md
README.md

How do I submit patches to Android Common Kernels

  1. BEST: Make all of your changes to upstream Linux. If appropriate, backport to the stable releases. These patches will be merged automatically in the corresponding common kernels. If the patch is already in upstream Linux, post a backport of the patch that conforms to the patch requirements below.

    • Do not send patches upstream that contain only symbol exports. To be considered for upstream Linux, additions of EXPORT_SYMBOL_GPL() require an in-tree modular driver that uses the symbol -- so include the new driver or changes to an existing driver in the same patchset as the export.
    • When sending patches upstream, the commit message must contain a clear case for why the patch is needed and beneficial to the community. Enabling out-of-tree drivers or functionality is not not a persuasive case.

  2. LESS GOOD: Develop your patches out-of-tree (from an upstream Linux point-of-view). Unless these are fixing an Android-specific bug, these are very unlikely to be accepted unless they have been coordinated with kernel-team@android.com. If you want to proceed, post a patch that conforms to the patch requirements below.

Common Kernel patch requirements

  • All patches must conform to the Linux kernel coding standards and pass script/checkpatch.pl
  • Patches shall not break gki_defconfig or allmodconfig builds for arm, arm64, x86, x86_64 architectures (see https://source.android.com/setup/build/building-kernels)
  • If the patch is not merged from an upstream branch, the subject must be tagged with the type of patch: UPSTREAM:, BACKPORT:, FROMGIT:, FROMLIST:, or ANDROID:.
  • All patches must have a Change-Id: tag (see https://gerrit-review.googlesource.com/Documentation/user-changeid.html)
  • If an Android bug has been assigned, there must be a Bug: tag.
  • All patches must have a Signed-off-by: tag by the author and the submitter

Additional requirements are listed below based on patch type

Requirements for backports from mainline Linux: UPSTREAM:, BACKPORT:

  • If the patch is a cherry-pick from Linux mainline with no changes at all
    • tag the patch subject with UPSTREAM:.
    • add upstream commit information with a (cherry picked from commit ...) line
    • Example:
      • if the upstream commit message is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        UPSTREAM: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch requires any changes from the upstream version, tag the patch with BACKPORT: instead of UPSTREAM:.
    • use the same tags as UPSTREAM:
    • add comments about the changes under the (cherry picked from commit ...) line
    • Example:
        BACKPORT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        (cherry picked from commit c31e73121f4c1ec41143423ac6ce3ce6dafdcec1)
        [joe: Resolved minor conflict in drivers/foo/bar.c ]
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for other backports: FROMGIT:, FROMLIST:,

  • If the patch has been merged into an upstream maintainer tree, but has not yet been merged into Linux mainline
    • tag the patch subject with FROMGIT:
    • add info on where the patch came from as (cherry picked from commit <sha1> <repo> <branch>). This must be a stable maintainer branch (not rebased, so don't use linux-next for example).
    • if changes were required, use BACKPORT: FROMGIT:
    • Example:
      • if the commit message in the maintainer tree is
        important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>
  • then Joe Smith would upload the patch for the common kernel as
        FROMGIT: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        (cherry picked from commit 878a2fd9de10b03d11d2f622250285c7e63deace
         https://git.kernel.org/pub/scm/linux/kernel/git/foo/bar.git test-branch)
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch has been submitted to LKML, but not accepted into any maintainer tree
    • tag the patch subject with FROMLIST:
    • add a Link: tag with a link to the submittal on lore.kernel.org
    • add a Bug: tag with the Android bug (required for patches not accepted into a maintainer tree)
    • if changes were required, use BACKPORT: FROMLIST:
    • Example:
        FROMLIST: important patch from upstream

        This is the detailed description of the important patch

        Signed-off-by: Fred Jones <fred.jones@foo.org>

        Bug: 135791357
        Link: https://lore.kernel.org/lkml/20190619171517.GA17557@someone.com/
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>

Requirements for Android-specific patches: ANDROID:

  • If the patch is fixing a bug to Android-specific code
    • tag the patch subject with ANDROID:
    • add a Fixes: tag that cites the patch with the bug
    • Example:
        ANDROID: fix android-specific bug in foobar.c

        This is the detailed description of the important fix

        Fixes: 1234abcd2468 ("foobar: add cool feature")
        Change-Id: I4caaaa566ea080fa148c5e768bb1a0b6f7201c01
        Signed-off-by: Joe Smith <joe.smith@foo.org>
  • If the patch is a new feature
    • tag the patch subject with ANDROID:
    • add a Bug: tag with the Android bug (required for android-specific features)