Skip to content

[bugfix] fix canary support for functions with ASM inline #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PThierry merged 1 commit into from
Mar 6, 2020
Merged

[bugfix] fix canary support for functions with ASM inline #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 13 additions & 12 deletions arch/cores/armv7-m/m4_syscall.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ int _main(uint32_t slot);
#pragma clang optimize off
/* Well, clang support local stack protection deactivation only since v8 :-/ */
#if __clang_major__ > 7
#pragma clang attribute push(__attribute__((no_stack_protector)), apply_to = do_starttask)
#pragma clang attribute push(__attribute__((no_stack_protector)))
#endif
#endif

Expand Down Expand Up @@ -72,17 +72,6 @@ __IN_SEC_VDSO void __stack_chk_fail(void)
};
}

#if __clang__
#pragma clang optimize on
#if __clang_major__ > 7
#pragma clang attribute pop
#endif
#endif

#if __GNUC__
#pragma GCC pop_options
#endif

/**
** \private
** ISR handler glue. The kernel must set the real handler @ in the
Expand Down Expand Up @@ -278,3 +267,15 @@ __IN_SEC_VDSO e_syscall_ret do_syscall(e_svc_type svc, __attribute__ ((unused))
return SYS_E_INVAL;
}
}

#if __clang__
#pragma clang optimize on
#if __clang_major__ > 7
#pragma clang attribute pop
#endif
#endif

#if __GNUC__
#pragma GCC pop_options
#endif