Google Git
Sign in
android / kernel / msm / c33d329257e5c5e7493578832fb18ca5e8d29bb9
commitc33d329257e5c5e7493578832fb18ca5e8d29bb9[log] [tgz]
authorAndrew Evans <andrewevans@google.com>Mon Oct 02 13:42:32 2023 -0700
committerAndrew Evans <andrewevans@google.com>Mon Oct 02 13:42:32 2023 -0700
tree008ca8d260ae1002416d20b991edc094e2159a3f
parent179257dabb9c470e0f8812dbf2bf79e0130feec0 [diff]
parentb9273b57406e0ecc720df22a8e8d204e54914548 [diff]
Merge "msm: adsprpc: Handle UAF in process shell memory"

Bug: 218338016
Change-Id: I1575db39e7aeba2f6b7ddcfabf6a4dd5a5218a5f
Signed-off-by: Andrew Evans <andrewevans@google.com>
tree: 008ca8d260ae1002416d20b991edc094e2159a3f
  1. android/
  2. arch/
  3. bindings/
  4. block/
  5. certs/
  6. crypto/
  7. Documentation/
  8. drivers/
  9. fs/
  10. include/
  11. init/
  12. io_uring/
  13. ipc/
  14. kernel/
  15. lib/
  16. LICENSES/
  17. mm/
  18. net/
  19. samples/
  20. scripts/
  21. security/
  22. sound/
  23. tools/
  24. usr/
  25. virt/
  26. modules.vendor_blocklist.msm.waipio ⇨ modules.vendor_blocklist.msm.kalama
  27. .clang-format
  28. .cocciconfig
  29. .get_maintainer.ignore
  30. .gitattributes
  31. .gitignore
  32. .mailmap
  33. Android.bp
  34. BUILD.bazel
  35. build.config.aarch64
  36. build.config.allmodconfig
  37. build.config.allmodconfig.aarch64
  38. build.config.allmodconfig.arm
  39. build.config.allmodconfig.x86_64
  40. build.config.amlogic
  41. build.config.arm
  42. build.config.common
  43. build.config.constants
  44. build.config.db845c
  45. build.config.gce.x86_64
  46. build.config.gki
  47. build.config.gki-debug.aarch64
  48. build.config.gki-debug.x86_64
  49. build.config.gki.aarch64
  50. build.config.gki.aarch64.fips140
  51. build.config.gki.x86_64
  52. build.config.gki_consolidate.aarch64
  53. build.config.gki_kasan
  54. build.config.gki_kasan.aarch64
  55. build.config.gki_kasan.x86_64
  56. build.config.gki_kprobes
  57. build.config.gki_kprobes.aarch64
  58. build.config.gki_kprobes.x86_64
  59. build.config.khwasan
  60. build.config.msm.auto
  61. build.config.msm.autogvm
  62. build.config.msm.autogvm.lxc
  63. build.config.msm.bengal
  64. build.config.msm.cinder
  65. build.config.msm.common
  66. build.config.msm.csm
  67. build.config.msm.gen3auto
  68. build.config.msm.gen3auto.lxc
  69. build.config.msm.gen4auto.lxc
  70. build.config.msm.generic_vm
  71. build.config.msm.gki
  72. build.config.msm.gki_fragement.kalama_le
  73. build.config.msm.gki_fragement.kona_le
  74. build.config.msm.iot
  75. build.config.msm.kalama
  76. build.config.msm.kalama.le
  77. build.config.msm.kalama.oemvm
  78. build.config.msm.kalama.tuivm
  79. build.config.msm.kalama.vm
  80. build.config.msm.kona
  81. build.config.msm.kona.le
  82. build.config.msm.monaco
  83. build.config.msm.qcs405
  84. build.config.msm.sa410m_auto
  85. build.config.msm.scuba_auto
  86. build.config.msm.sdmsteppeauto
  87. build.config.msm.sdxbaagha
  88. build.config.msm.sdxpinn
  89. build.config.msm.telematics
  90. build.config.msm.trinket
  91. build.config.msm.vm
  92. build.config.msm.waipio
  93. build.config.msm.waipio.oemvm
  94. build.config.msm.waipio.tuivm
  95. build.config.msm.waipio.vm
  96. build.config.rockpi4
  97. build.config.x86_64
  98. build.targets
  99. COPYING
  100. CREDITS
  101. files_gki_aarch64.txt
  102. Kbuild
  103. Kconfig
  104. Kconfig.ext
  105. MAINTAINERS
  106. Makefile
  107. modules.list.msm.autogvm
  108. modules.list.msm.bengal
  109. modules.list.msm.gen3auto
  110. modules.list.msm.kalama
  111. modules.list.msm.kalama.le
  112. modules.list.msm.kona
  113. modules.list.msm.kona.le
  114. modules.list.msm.monaco
  115. modules.list.msm.sdmsteppeauto
  116. modules.list.msm.trinket
  117. modules.list.msm.waipio
  118. modules.systemdlkm_blocklist.msm.autogvm
  119. modules.systemdlkm_blocklist.msm.bengal
  120. modules.systemdlkm_blocklist.msm.gen3auto
  121. modules.systemdlkm_blocklist.msm.kalama
  122. modules.systemdlkm_blocklist.msm.kalama.le
  123. modules.systemdlkm_blocklist.msm.kona
  124. modules.systemdlkm_blocklist.msm.kona.le
  125. modules.systemdlkm_blocklist.msm.monaco
  126. modules.systemdlkm_blocklist.msm.trinket
  127. modules.vendor_blocklist.msm.autogvm
  128. modules.vendor_blocklist.msm.bengal
  129. modules.vendor_blocklist.msm.gen3auto
  130. modules.vendor_blocklist.msm.kalama
  131. modules.vendor_blocklist.msm.kalama.le
  132. modules.vendor_blocklist.msm.kona
  133. modules.vendor_blocklist.msm.kona.le
  134. modules.vendor_blocklist.msm.monaco
  135. modules.vendor_blocklist.msm.trinket
  136. OWNERS
  137. OWNERS_core
  138. OWNERS_pixelwatchbsp
  139. README
  140. 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 scripts/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)