Skip to content

[2.3.2.r1.4] msm: kgsl: Three patches from the Feb Android bulletin#2182

Merged
jerpelea merged 3 commits intosonyxperiadev:aosp/LE.UM.2.3.2.r1.4from
ix5:232r1-security-2020-02-05-caf
Feb 17, 2020
Merged

[2.3.2.r1.4] msm: kgsl: Three patches from the Feb Android bulletin#2182
jerpelea merged 3 commits intosonyxperiadev:aosp/LE.UM.2.3.2.r1.4from
ix5:232r1-security-2020-02-05-caf

Conversation

@ix5
Copy link

@ix5 ix5 commented Feb 8, 2020

https://source.android.com/security/bulletin/2020-02-01#qualcomm-components

4.14 seems unaffected, we're already patched up (thanks @nathanchance!)

State, as far as I could determine: https://sx.ix5.org/info/post/sodp-2020-02-05-security-state/

Also part of the Feb patches: #2183 -> Not necessary


The dword change in adreno_ringbuffer.c seems bad for legacy to me?

Build-tested for kagura.

@ix5
Copy link
Author

ix5 commented Feb 8, 2020

Kagura boots fine

ix5 added 3 commits February 12, 2020 11:40
If a command is using a profiling buffer, make sure that the offset
is within the bounds of the specified memory descriptor.

Change-Id: Ic0dedbadc77e8eccd957136467bd0c56a1af2dab
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
To prepare to allow global buffers to allocate a semi-random GPU address
move from a sequential allocator to a bitmap based one.

Adapted to the SODP 4.9 kernel to use macros with `(mmu)` arguments:
`GLOBAL_MAP_PAGES(mmu)` and `KGSL_IOMMU_GLOBAL_MEM_SIZE(mmu)` and
`KGSL_IOMMU_GLOBAL_MEM_SIZE_NG >> PAGE_SHIFT` instead of
`GLOBAL_MAP_PAGES` in `DECLARE_BITMAP`

Change-Id: Ic0dedbadba36c4c7b7839528103997724eac7d6d
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Deepak Kumar <dkumar@codeaurora.org>
Signed-off-by: ix5 <ix5@users.noreply.github.com>
Execute user profiling in an indirect buffer. This ensures that addresses
and values specified directly from the user don't end up in the
ringbuffer.

FIXME: Felix: Left a comment in adreno_ringbuffer.c about dword length
for legacy, needs to be adressed!

Change-Id: Ic0dedbadedcaab29ce5738a39c1ff6269261bae4
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Harshitha Sai Neelati <hsaine@codeaurora.org>
Signed-off-by: ix5 <ix5@users.noreply.github.com>
@ix5 ix5 force-pushed the 232r1-security-2020-02-05-caf branch from 3de124a to ee6e89f Compare February 12, 2020 10:41
@ix5 ix5 marked this pull request as ready for review February 12, 2020 10:41
@stefanhh0
Copy link

Compiles, boots and runs fine on yoshino/lilac on top of latest 4.9.213

@stefanhh0
Copy link

@ix5 [WIP] can be removed? Or still something open?

@ix5
Copy link
Author

ix5 commented Feb 14, 2020

@stefanhh0 I really wouldn't like to break other devices, but it seems this is ok to merge now.

@ix5 ix5 changed the title [WIP] [2.3.2.r1.4] msm: kgsl: Three patches from the Feb Android bulletin [2.3.2.r1.4] msm: kgsl: Three patches from the Feb Android bulletin Feb 14, 2020
@jerpelea jerpelea merged commit dbfc0e4 into sonyxperiadev:aosp/LE.UM.2.3.2.r1.4 Feb 17, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants