am skip reason: Merged-In I876267ab4e44083215ae313de5e4897b06e9ec49 with SHA-1 23acefc286 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17805472
Change-Id: I1421e8c65995da86bd447b4b141d21a989a72498
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I876267ab4e44083215ae313de5e4897b06e9ec49 with SHA-1 23acefc286 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17805472
Change-Id: I5f8c3ed5bbb8091c4e27611df7937dffcae32ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In I876267ab4e44083215ae313de5e4897b06e9ec49 with SHA-1 23acefc286 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/17805472
Change-Id: I46beb9fe95558984e611629fad66952c2743741c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
No changes were necessary, but since I noticed "die"
wasn't defined I removed usages of it.
Test: python3 ./tools/kconfig_xml_fixup.py --input android-5.15/android-base-conditional.xml --output-matrix ./outputmatrix --output-version ./outputversion
Bug: 203436762
Change-Id: I7a94c57c88b96aba393655151cc5e872953dee6e
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769
Change-Id: I68211a78f1089d781e9f1050d802bf74e56eb96a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769
Change-Id: I496c961aa3aa32a3e1ed7b86740a78eee20ab83f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769
Change-Id: I3aede6920ec312df5fa4047de60fb2338160dd33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769
Change-Id: I06f6309b77380f6c02505a9c8dfd3275c1b6cb21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
am skip reason: Merged-In If26571c075946bbc3ca92dde9b4b813881365b26 with SHA-1 1c9d2751be is already in history
Original change: https://android-review.googlesource.com/c/kernel/configs/+/2052769
Change-Id: I173c28d4cc8e7ccecdb90d11b06889ba860b2229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
CONFIG_INIT_STACK_ALL_ZERO minimizes the effect of bugs caused by uninitialized locals, so we want to prevent it from being accidentally disabled.
Bug: 204439281
Bug: 205279854
Test: TreeHugger
Change-Id: I2014cd9bc2e3ebb8442ccc632c82619d62645dd4
Turns unbounded recursion in kernel code from being a potentially
exploitable bug into a crash.
This is likely a no-op. CONFIG_VMAP_STACK is already the default
on architectures that support it. CONFIG_VMAP_STACK has been
supported on x86_64 since 4.9 and on arm64 since 4.14. This change
is to prevent it from being accidentally disabled.
Test: On Pixel 5:
adb pull /proc/config.gz gunzip config.gz;
grep CONFIG_VMAP_STACK=y config
Bug: 117194687
Change-Id: I458d7a9d3a28b057b372a7456dbdeb3397423a15
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
This reverts commit dd46951e69.
Reason for revert: downstream kernel projects failed an unrelated SELinux related test when they
updated from Android Common Kernel, so they rolled back their pull dropping the patches necessary
to make this test pass.
Bug: 210043760
Bug: 214384465
Change-Id: I0f591dfa23017fec00733891dad6ec286a697585