| commit | 65d56cb593ff0cea5e682d7b8642a8a2affa6734 | [log] [tgz] |
|---|---|---|
| author | Jenkins SH <jenkins.sh@amlogic.com> | Wed Aug 07 08:35:20 2024 +0000 |
| committer | Jenkins SH <jenkins.sh@amlogic.com> | Wed Aug 07 08:35:20 2024 +0000 |
| tree | b5d614e236eac82b0c3b2175165565a160270028 | |
| parent | 7e0bcd5dcc6c6122659a365f1271f653ba7cd11f [diff] |
commit 46f63d2a58e6af1d5a3d03d0aea315fdb3a9da22
Author: wentao.sun <wentao.sun@amlogic.com>
Date: Tue Jul 9 11:12:34 2024 +0800
core: mm: strip the tag of VA when check_pa_matches_va [1/1]
PD#RSP-6432
Problem:
When CFG_TEE_CORE_DEBUG=y and CFG_MEMTAG=y, core will crash, if there are
some modules call virt_to_phys() or core_vbuf_is() and so on.
Because the MM can not find map by the tagged VA, so strip the tag of
VA when check_pa_matches_va().
Solution:
strip the tag of VA when check_pa_matches_va
Verify:
Android U + S6
Suggested-by: Jens Wiklander <jens.wiklander@linaro.org>
Acked-by: Jerome Forissier <jerome.forissier@linaro.org>
Change-Id: I440743886c05810fc85c77b88c373cff8efd3236
Signed-off-by: wentao.sun <wentao.sun@amlogic.com>
Change-Id: Ie591581473286700031be47386d82d11707706c5
diff --git a/a1/bl32.img b/a1/bl32.img index 0d82fd7..0b32bcb 100644 --- a/a1/bl32.img +++ b/a1/bl32.img Binary files differ
diff --git a/a4/a113l2/blob-bl32.bin.signed b/a4/a113l2/blob-bl32.bin.signed index 10ab980..fde3081 100644 --- a/a4/a113l2/blob-bl32.bin.signed +++ b/a4/a113l2/blob-bl32.bin.signed Binary files differ
diff --git a/axg/bl32.img b/axg/bl32.img index 50cde36..52ab208 100644 --- a/axg/bl32.img +++ b/axg/bl32.img Binary files differ
diff --git a/axg/bl32.nand.img b/axg/bl32.nand.img index 8d821c5..2f906ec 100644 --- a/axg/bl32.nand.img +++ b/axg/bl32.nand.img Binary files differ
diff --git a/s1a/s805c1/blob-bl32.bin.signed b/s1a/s805c1/blob-bl32.bin.signed index 69f2fe5..d2055f1 100644 --- a/s1a/s805c1/blob-bl32.bin.signed +++ b/s1a/s805c1/blob-bl32.bin.signed Binary files differ
diff --git a/s1a/s805c1eng/blob-bl32.bin.signed b/s1a/s805c1eng/blob-bl32.bin.signed index f5a4728..5c6fc40 100644 --- a/s1a/s805c1eng/blob-bl32.bin.signed +++ b/s1a/s805c1eng/blob-bl32.bin.signed Binary files differ
diff --git a/s5/s928x/blob-bl32.bin.signed b/s5/s928x/blob-bl32.bin.signed index 747bf4e..39d385d 100644 --- a/s5/s928x/blob-bl32.bin.signed +++ b/s5/s928x/blob-bl32.bin.signed Binary files differ
diff --git a/s5/s928xeng/blob-bl32.bin.signed b/s5/s928xeng/blob-bl32.bin.signed index 7978e69..d98e01e 100644 --- a/s5/s928xeng/blob-bl32.bin.signed +++ b/s5/s928xeng/blob-bl32.bin.signed Binary files differ
diff --git a/s6/s905c5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa b/s6/s905c5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa index 304a70e..804b659 100644 --- a/s6/s905c5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa +++ b/s6/s905c5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa Binary files differ
diff --git a/s6/s905c5eng/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa b/s6/s905c5eng/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa index cc521bb..d284b94 100644 --- a/s6/s905c5eng/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa +++ b/s6/s905c5eng/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa Binary files differ
diff --git a/s6/s905d5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa b/s6/s905d5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa index f636f8f..900c633 100644 --- a/s6/s905d5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa +++ b/s6/s905d5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa Binary files differ
diff --git a/s6/s905x5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa b/s6/s905x5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa index bb3837e..f8aea88 100644 --- a/s6/s905x5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa +++ b/s6/s905x5/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa Binary files differ
diff --git a/s6/s905x5l/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa b/s6/s905x5l/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa index 2ffabdd..a979fd9 100644 --- a/s6/s905x5l/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa +++ b/s6/s905x5l/blob-bl32.bin.signed.rsa-mldsa.rsa-mldsa Binary files differ
diff --git a/s7/s805x3/blob-bl32.bin.signed b/s7/s805x3/blob-bl32.bin.signed index ba6511a..4c40a79 100644 --- a/s7/s805x3/blob-bl32.bin.signed +++ b/s7/s805x3/blob-bl32.bin.signed Binary files differ
diff --git a/s7/s805x3/blob-bl32.nand.bin.signed b/s7/s805x3/blob-bl32.nand.bin.signed new file mode 100644 index 0000000..553bfd3 --- /dev/null +++ b/s7/s805x3/blob-bl32.nand.bin.signed Binary files differ
diff --git a/s7/s905y5/blob-bl32.bin.signed b/s7/s905y5/blob-bl32.bin.signed index fbcdf61..744e290 100644 --- a/s7/s905y5/blob-bl32.bin.signed +++ b/s7/s905y5/blob-bl32.bin.signed Binary files differ
diff --git a/s7/s905y5eng/blob-bl32.bin.signed b/s7/s905y5eng/blob-bl32.bin.signed index 0bb2302..5a4b923 100644 --- a/s7/s905y5eng/blob-bl32.bin.signed +++ b/s7/s905y5eng/blob-bl32.bin.signed Binary files differ
diff --git a/s7/s905y5r/blob-bl32.bin.signed b/s7/s905y5r/blob-bl32.bin.signed index ec38dbc..cc34e40 100644 --- a/s7/s905y5r/blob-bl32.bin.signed +++ b/s7/s905y5r/blob-bl32.bin.signed Binary files differ
diff --git a/s7d/s905x5m/blob-bl32.bin.signed.rsa.rsa b/s7d/s905x5m/blob-bl32.bin.signed.rsa.rsa index edcb45e..669858f 100755 --- a/s7d/s905x5m/blob-bl32.bin.signed.rsa.rsa +++ b/s7d/s905x5m/blob-bl32.bin.signed.rsa.rsa Binary files differ
diff --git a/s7d/s905x5meng/blob-bl32.bin.signed.rsa.rsa b/s7d/s905x5meng/blob-bl32.bin.signed.rsa.rsa index a7df79b..7759abe 100644 --- a/s7d/s905x5meng/blob-bl32.bin.signed.rsa.rsa +++ b/s7d/s905x5meng/blob-bl32.bin.signed.rsa.rsa Binary files differ
diff --git a/t3x/t968d4/blob-bl32.bin.signed b/t3x/t968d4/blob-bl32.bin.signed index 6b313b3..d913728 100644 --- a/t3x/t968d4/blob-bl32.bin.signed +++ b/t3x/t968d4/blob-bl32.bin.signed Binary files differ
diff --git a/t5m/t963d4/blob-bl32.bin.signed b/t5m/t963d4/blob-bl32.bin.signed index a14570a..181e481 100755 --- a/t5m/t963d4/blob-bl32.bin.signed +++ b/t5m/t963d4/blob-bl32.bin.signed Binary files differ
diff --git a/t5m/tc8000/blob-bl32.bin.signed b/t5m/tc8000/blob-bl32.bin.signed index 152f177..19f0ae7 100644 --- a/t5m/tc8000/blob-bl32.bin.signed +++ b/t5m/tc8000/blob-bl32.bin.signed Binary files differ
diff --git a/txhd2/bl32.8m.img b/txhd2/bl32.8m.img index be21fc9..fe82a02 100644 --- a/txhd2/bl32.8m.img +++ b/txhd2/bl32.8m.img Binary files differ
diff --git a/txhd2/bl32.img b/txhd2/bl32.img index 68313c5..27c65b3 100644 --- a/txhd2/bl32.img +++ b/txhd2/bl32.img Binary files differ