Skip to content
Permalink
Browse files
MDEV-21248: Prevent optimizing out buf argument in check_stack_overrun.
When using LTO, one can see optimization of stack variables that
are passed to check_stack_overrun as argument buf. That prevents
proper stack overrun detection.
  • Loading branch information
marxin authored and an3l committed Feb 8, 2020
1 parent 0d1ca19 commit 35c2778
Showing 1 changed file with 11 additions and 2 deletions.
@@ -7392,8 +7392,17 @@ long max_stack_used;
corresponding exec. (Thus we only have to check in fix_fields.)
- Passing to check_stack_overrun() prevents the compiler from removing it.
*/
bool check_stack_overrun(THD *thd, long margin,
uchar *buf __attribute__((unused)))

bool
#ifdef __GNUC__
/*
Do not optimize the function in order to preserve a stack variable creation.
Otherwise, the variable pointed as "buf" can be removed due to a missing
usage.
*/
__attribute__((optimize("-O0")))
#endif
check_stack_overrun(THD *thd, long margin, uchar *buf __attribute__((unused)))
{
long stack_used;
DBUG_ASSERT(thd == current_thd);

0 comments on commit 35c2778

Please sign in to comment.