Sync OP-TEE driver with new naming of interrupts #39

david-wang-2015 · 2017-02-28T04:41:22Z

In the latest changes of optee_os, the interrupts' names are changed to "native" and "foreign" interrupts.

jenswi-linaro · 2017-02-28T07:16:19Z

drivers/tee/optee/optee_smc.h


 /*
- * Deliver an IRQ in normal world.
+ * Deliver a foreign interrupt in normal world.


Doesn't "Deliver a foreign interrupt in normal world" sound better?

Doesn't "Deliver a foreign interrupt in normal world" sound better?

Hi @jenswi-linaro ,
Sorry, did you suggest to reword the comment "Deliver a foreign interrupt in normal world."

Sorry, paste error. It should have been "Deliver foreign interrupt to normal world".
Once we're in normal world it's not a foreign interrupt anymore.
I'm only suggesting to think about it, if you agree please change otherwise keep it as it is.

Yes, you're right. :)

jenswi-linaro · 2017-02-28T07:17:54Z

Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

In the latest changes of optee_os, the interrupts' names are changed to "native" and "foreign" interrupts. Signed-off-by: David Wang <david.wang@arm.com> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

david-wang-2015 · 2017-02-28T10:55:54Z

Fixed

jforissier · 2017-04-24T08:11:43Z

drivers/tee/optee/rpc.c:377:7: error: 'OPTEE_SMC_RPC_FUNC_IRQ' undeclared (first use in this function)
  case OPTEE_SMC_RPC_FUNC_IRQ:
       ^~~~~~~~~~~~~~~~~~~~~~
drivers/tee/optee/rpc.c:377:7: note: each undeclared identifier is reported only once for each function it appears in
scripts/Makefile.build:293: recipe for target 'drivers/tee/optee/rpc.o' failed
make[5]: *** [drivers/tee/optee/rpc.o] Error 1

I have reverted this patch (force pushed). @davwan01 have you actually built the driver with your patch applied?

david-wang-2015 · 2017-04-24T08:18:38Z

Hi @jforissier,
Is it already covered by CI? I don't know how to build and test this repository.

jforissier · 2017-04-24T08:26:21Z

So you don't know how to build linux, yet you are submitting a patch here? 😕
Anyway, it's OK, I can fix the patch myself and merge it. And, no, there is no CI in place on this repo.

jforissier · 2017-04-24T08:32:13Z

49ece5d merged.

david-wang-2015 · 2017-04-24T09:39:29Z

So you don't know how to build linux, yet you are submitting a patch here?
Anyway, it's OK, I can fix the patch myself and merge it. And, no, there is no CI in place on this repo.

Hi @jforissier ,
Sorry, I was asked to sync up the renamed macros in this repository when I was doing the changes in optee_os (OP-TEE/optee_os#1345). Didn't notice it's not covered by CI (at least build)...
BTW, could you point me that combinations of builds/tests I should do locally before PR? Just in case I need to push some patches again.
Thanks for your help. :)

jockebech · 2017-04-24T09:43:51Z

@davwan01 , in your case I suspect you're using the Juno board and then I'd suggest that you try it out according to the instructions for Juno here and here.

david-wang-2015 · 2017-04-24T09:51:00Z

@jbech-linaro , OK, it seems "replace the Linux folder in Linaro release package and test again". :)
Thanks.

Our syzkaller report a following UAF for v6.6: BUG: KASAN: slab-use-after-free in bfq_init_rq+0x175d/0x17a0 block/bfq-iosched.c:6958 Read of size 8 at addr ffff8881b57147d8 by task fsstress/232726 CPU: 2 PID: 232726 Comm: fsstress Not tainted 6.6.0-g3629d1885222 linaro-swg#39 Call Trace: <TASK> __dump_stack lib/dump_stack.c:88 [inline] dump_stack_lvl+0x91/0xf0 lib/dump_stack.c:106 print_address_description.constprop.0+0x66/0x300 mm/kasan/report.c:364 print_report+0x3e/0x70 mm/kasan/report.c:475 kasan_report+0xb8/0xf0 mm/kasan/report.c:588 hlist_add_head include/linux/list.h:1023 [inline] bfq_init_rq+0x175d/0x17a0 block/bfq-iosched.c:6958 bfq_insert_request.isra.0+0xe8/0xa20 block/bfq-iosched.c:6271 bfq_insert_requests+0x27f/0x390 block/bfq-iosched.c:6323 blk_mq_insert_request+0x290/0x8f0 block/blk-mq.c:2660 blk_mq_submit_bio+0x1021/0x15e0 block/blk-mq.c:3143 __submit_bio+0xa0/0x6b0 block/blk-core.c:639 __submit_bio_noacct_mq block/blk-core.c:718 [inline] submit_bio_noacct_nocheck+0x5b7/0x810 block/blk-core.c:747 submit_bio_noacct+0xca0/0x1990 block/blk-core.c:847 __ext4_read_bh fs/ext4/super.c:205 [inline] ext4_read_bh+0x15e/0x2e0 fs/ext4/super.c:230 __read_extent_tree_block+0x304/0x6f0 fs/ext4/extents.c:567 ext4_find_extent+0x479/0xd20 fs/ext4/extents.c:947 ext4_ext_map_blocks+0x1a3/0x2680 fs/ext4/extents.c:4182 ext4_map_blocks+0x929/0x15a0 fs/ext4/inode.c:660 ext4_iomap_begin_report+0x298/0x480 fs/ext4/inode.c:3569 iomap_iter+0x3dd/0x1010 fs/iomap/iter.c:91 iomap_fiemap+0x1f4/0x360 fs/iomap/fiemap.c:80 ext4_fiemap+0x181/0x210 fs/ext4/extents.c:5051 ioctl_fiemap.isra.0+0x1b4/0x290 fs/ioctl.c:220 do_vfs_ioctl+0x31c/0x11a0 fs/ioctl.c:811 __do_sys_ioctl fs/ioctl.c:869 [inline] __se_sys_ioctl+0xae/0x190 fs/ioctl.c:857 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x70/0x120 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x78/0xe2 Allocated by task 232719: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 __kasan_slab_alloc+0x87/0x90 mm/kasan/common.c:328 kasan_slab_alloc include/linux/kasan.h:188 [inline] slab_post_alloc_hook mm/slab.h:768 [inline] slab_alloc_node mm/slub.c:3492 [inline] kmem_cache_alloc_node+0x1b8/0x6f0 mm/slub.c:3537 bfq_get_queue+0x215/0x1f00 block/bfq-iosched.c:5869 bfq_get_bfqq_handle_split+0x167/0x5f0 block/bfq-iosched.c:6776 bfq_init_rq+0x13a4/0x17a0 block/bfq-iosched.c:6938 bfq_insert_request.isra.0+0xe8/0xa20 block/bfq-iosched.c:6271 bfq_insert_requests+0x27f/0x390 block/bfq-iosched.c:6323 blk_mq_insert_request+0x290/0x8f0 block/blk-mq.c:2660 blk_mq_submit_bio+0x1021/0x15e0 block/blk-mq.c:3143 __submit_bio+0xa0/0x6b0 block/blk-core.c:639 __submit_bio_noacct_mq block/blk-core.c:718 [inline] submit_bio_noacct_nocheck+0x5b7/0x810 block/blk-core.c:747 submit_bio_noacct+0xca0/0x1990 block/blk-core.c:847 __ext4_read_bh fs/ext4/super.c:205 [inline] ext4_read_bh_nowait+0x15a/0x240 fs/ext4/super.c:217 ext4_read_bh_lock+0xac/0xd0 fs/ext4/super.c:242 ext4_bread_batch+0x268/0x500 fs/ext4/inode.c:958 __ext4_find_entry+0x448/0x10f0 fs/ext4/namei.c:1671 ext4_lookup_entry fs/ext4/namei.c:1774 [inline] ext4_lookup.part.0+0x359/0x6f0 fs/ext4/namei.c:1842 ext4_lookup+0x72/0x90 fs/ext4/namei.c:1839 __lookup_slow+0x257/0x480 fs/namei.c:1696 lookup_slow fs/namei.c:1713 [inline] walk_component+0x454/0x5c0 fs/namei.c:2004 link_path_walk.part.0+0x773/0xda0 fs/namei.c:2331 link_path_walk fs/namei.c:3826 [inline] path_openat+0x1b9/0x520 fs/namei.c:3826 do_filp_open+0x1b7/0x400 fs/namei.c:3857 do_sys_openat2+0x5dc/0x6e0 fs/open.c:1428 do_sys_open fs/open.c:1443 [inline] __do_sys_openat fs/open.c:1459 [inline] __se_sys_openat fs/open.c:1454 [inline] __x64_sys_openat+0x148/0x200 fs/open.c:1454 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x70/0x120 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x78/0xe2 Freed by task 232726: kasan_save_stack+0x22/0x50 mm/kasan/common.c:45 kasan_set_track+0x25/0x30 mm/kasan/common.c:52 kasan_save_free_info+0x2b/0x50 mm/kasan/generic.c:522 ____kasan_slab_free mm/kasan/common.c:236 [inline] __kasan_slab_free+0x12a/0x1b0 mm/kasan/common.c:244 kasan_slab_free include/linux/kasan.h:164 [inline] slab_free_hook mm/slub.c:1827 [inline] slab_free_freelist_hook mm/slub.c:1853 [inline] slab_free mm/slub.c:3820 [inline] kmem_cache_free+0x110/0x760 mm/slub.c:3842 bfq_put_queue+0x6a7/0xfb0 block/bfq-iosched.c:5428 bfq_forget_entity block/bfq-wf2q.c:634 [inline] bfq_put_idle_entity+0x142/0x240 block/bfq-wf2q.c:645 bfq_forget_idle+0x189/0x1e0 block/bfq-wf2q.c:671 bfq_update_vtime block/bfq-wf2q.c:1280 [inline] __bfq_lookup_next_entity block/bfq-wf2q.c:1374 [inline] bfq_lookup_next_entity+0x350/0x480 block/bfq-wf2q.c:1433 bfq_update_next_in_service+0x1c0/0x4f0 block/bfq-wf2q.c:128 bfq_deactivate_entity+0x10a/0x240 block/bfq-wf2q.c:1188 bfq_deactivate_bfqq block/bfq-wf2q.c:1592 [inline] bfq_del_bfqq_busy+0x2e8/0xad0 block/bfq-wf2q.c:1659 bfq_release_process_ref+0x1cc/0x220 block/bfq-iosched.c:3139 bfq_split_bfqq+0x481/0xdf0 block/bfq-iosched.c:6754 bfq_init_rq+0xf29/0x17a0 block/bfq-iosched.c:6934 bfq_insert_request.isra.0+0xe8/0xa20 block/bfq-iosched.c:6271 bfq_insert_requests+0x27f/0x390 block/bfq-iosched.c:6323 blk_mq_insert_request+0x290/0x8f0 block/blk-mq.c:2660 blk_mq_submit_bio+0x1021/0x15e0 block/blk-mq.c:3143 __submit_bio+0xa0/0x6b0 block/blk-core.c:639 __submit_bio_noacct_mq block/blk-core.c:718 [inline] submit_bio_noacct_nocheck+0x5b7/0x810 block/blk-core.c:747 submit_bio_noacct+0xca0/0x1990 block/blk-core.c:847 __ext4_read_bh fs/ext4/super.c:205 [inline] ext4_read_bh+0x15e/0x2e0 fs/ext4/super.c:230 __read_extent_tree_block+0x304/0x6f0 fs/ext4/extents.c:567 ext4_find_extent+0x479/0xd20 fs/ext4/extents.c:947 ext4_ext_map_blocks+0x1a3/0x2680 fs/ext4/extents.c:4182 ext4_map_blocks+0x929/0x15a0 fs/ext4/inode.c:660 ext4_iomap_begin_report+0x298/0x480 fs/ext4/inode.c:3569 iomap_iter+0x3dd/0x1010 fs/iomap/iter.c:91 iomap_fiemap+0x1f4/0x360 fs/iomap/fiemap.c:80 ext4_fiemap+0x181/0x210 fs/ext4/extents.c:5051 ioctl_fiemap.isra.0+0x1b4/0x290 fs/ioctl.c:220 do_vfs_ioctl+0x31c/0x11a0 fs/ioctl.c:811 __do_sys_ioctl fs/ioctl.c:869 [inline] __se_sys_ioctl+0xae/0x190 fs/ioctl.c:857 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x70/0x120 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x78/0xe2 commit 1ba0403 ("block, bfq: fix uaf for accessing waker_bfqq after splitting") fix the problem that if waker_bfqq is in the merge chain, and current is the only procress, waker_bfqq can be freed from bfq_split_bfqq(). However, the case that waker_bfqq is not in the merge chain is missed, and if the procress reference of waker_bfqq is 0, waker_bfqq can be freed as well. Fix the problem by checking procress reference if waker_bfqq is not in the merge_chain. Fixes: 1ba0403 ("block, bfq: fix uaf for accessing waker_bfqq after splitting") Signed-off-by: Hou Tao <houtao1@huawei.com> Signed-off-by: Yu Kuai <yukuai3@huawei.com> Reviewed-by: Jan Kara <jack@suse.cz> Link: https://lore.kernel.org/r/20250108084148.1549973-1-yukuai1@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>

david-wang-2015 mentioned this pull request Feb 28, 2017

Rename the secure and non-secure interrupts OP-TEE/optee_os#1345

Merged

jenswi-linaro reviewed Feb 28, 2017

View reviewed changes

Sync OP-TEE driver with new naming of interrupts

0d890ff

In the latest changes of optee_os, the interrupts' names are changed to "native" and "foreign" interrupts. Signed-off-by: David Wang <david.wang@arm.com> Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>

david-wang-2015 force-pushed the gicv3-rename branch from 583d3a5 to 0d890ff Compare February 28, 2017 10:55

david-wang-2015 mentioned this pull request Apr 24, 2017

Support ARM GICv3 mode OP-TEE/optee_os#1465

Merged

jforissier merged this pull request into linaro-swg:optee Apr 24, 2017

Sync OP-TEE driver with new naming of interrupts #39

Sync OP-TEE driver with new naming of interrupts #39

Uh oh!

Conversation

david-wang-2015 commented Feb 28, 2017

Uh oh!

jenswi-linaro Feb 28, 2017

Choose a reason for hiding this comment

Uh oh!

david-wang-2015 Feb 28, 2017

Choose a reason for hiding this comment

Uh oh!

jenswi-linaro Feb 28, 2017

Choose a reason for hiding this comment

Uh oh!

david-wang-2015 Feb 28, 2017

Choose a reason for hiding this comment

Uh oh!

jenswi-linaro commented Feb 28, 2017

Uh oh!

david-wang-2015 commented Feb 28, 2017

Uh oh!

jforissier commented Apr 24, 2017

Uh oh!

david-wang-2015 commented Apr 24, 2017

Uh oh!

jforissier commented Apr 24, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jforissier commented Apr 24, 2017

Uh oh!

david-wang-2015 commented Apr 24, 2017

Uh oh!

jockebech commented Apr 24, 2017

Uh oh!

david-wang-2015 commented Apr 24, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

jforissier commented Apr 24, 2017 •

edited

Loading