procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR sanitizer/64820 (Libsanitizer fails with ((AddrIsAlignedByGranularity(addr + size))) != (0)" (0x0, 0x0) if ssp is enabled.)

Browse source 
2015-03-16  Max Ostapenko  <m.ostapenko@partner.samsung.com>

	PR sanitizer/64820

	gcc/
	* cfgexpand.c (align_base): New function.
	(alloc_stack_frame_space): Call it.
	(expand_stack_vars): Align prev_frame to be sure
	data->asan_vec elements aligned properly.

	gcc/testsuite/
	* c-c++-common/asan/pr64820.c: New test.

From-SVN: r221457
This commit is contained in:
Max Ostapenko 2015-03-16 13:17:32 +02:00 • committed by Maxim Ostapenko
parent 6c25f79625
commit 435be74793
4 changed files with 63 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gcc/ChangeLog
View file

@ -1,3 +1,11 @@
2015-03-16 Max Ostapenko <m.ostapenko@partner.samsung.com>
PR sanitizer/64820
* cfgexpand.c (align_base): New function.
(alloc_stack_frame_space): Call it.
(expand_stack_vars): Align prev_frame to be sure
data->asan_vec elements aligned properly.
2015-03-16 Eric Botcazou <ebotcazou@adacore.com>
PR middle-end/65409

29
gcc/cfgexpand.c
View file

@ -282,6 +282,15 @@ align_local_variable (tree decl)
return align / BITS_PER_UNIT;
}
/* Align given offset BASE with ALIGN. Truncate up if ALIGN_UP is true,
down otherwise. Return truncated BASE value. */
static inline unsigned HOST_WIDE_INT
align_base (HOST_WIDE_INT base, unsigned HOST_WIDE_INT align, bool align_up)
{
return align_up ? (base + align - 1) & -align : base & -align;
}
/* Allocate SIZE bytes at byte alignment ALIGN from the stack frame.
Return the frame offset. */
@ -290,20 +299,17 @@ alloc_stack_frame_space (HOST_WIDE_INT size, unsigned HOST_WIDE_INT align)
{
HOST_WIDE_INT offset, new_frame_offset;
new_frame_offset = frame_offset;
if (FRAME_GROWS_DOWNWARD)
{
new_frame_offset -= size + frame_phase;
new_frame_offset &= -align;
new_frame_offset += frame_phase;
new_frame_offset
= align_base (frame_offset - frame_phase - size,
align, false) + frame_phase;
offset = new_frame_offset;
}
else
{
new_frame_offset -= frame_phase;
new_frame_offset += align - 1;
new_frame_offset &= -align;
new_frame_offset += frame_phase;
new_frame_offset
= align_base (frame_offset - frame_phase, align, true) + frame_phase;
offset = new_frame_offset;
new_frame_offset += size;
}
@ -1038,13 +1044,16 @@ expand_stack_vars (bool (*pred) (size_t), struct stack_vars_data *data)
base = virtual_stack_vars_rtx;
if ((flag_sanitize & SANITIZE_ADDRESS) && ASAN_STACK && pred)
{
HOST_WIDE_INT prev_offset = frame_offset;
HOST_WIDE_INT prev_offset
= align_base (frame_offset,
MAX (alignb, ASAN_RED_ZONE_SIZE),
FRAME_GROWS_DOWNWARD);
tree repr_decl = NULL_TREE;
offset
= alloc_stack_frame_space (stack_vars[i].size
+ ASAN_RED_ZONE_SIZE,
MAX (alignb, ASAN_RED_ZONE_SIZE));
data->asan_vec.safe_push (prev_offset);
data->asan_vec.safe_push (offset + stack_vars[i].size);
/* Find best representative of the partition.

5
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-16 Max Ostapenko <m.ostapenko@partner.samsung.com>
PR sanitizer/64820
* c-c++-common/asan/pr64820.c: New test.
2015-03-16 Andre Vehreschild <vehre@gmx.de>
* gfortran.dg/pointer_2.f90: New test.

31
gcc/testsuite/c-c++-common/asan/pr64820.c Normal file
View file

@ -0,0 +1,31 @@
/* { dg-do run } */
/* { dg-require-effective-target fstack_protector } */
/* { dg-options "-fstack-protector-strong" } */
/* { dg-set-target-env-var ASAN_OPTIONS "detect_stack_use_after_return=1" } */
/* { dg-shouldfail "asan" } */
__attribute__((noinline))
char *Ident(char *x) {
return x;
}
__attribute__((noinline))
char *Func1() {
char local[1 << 12];
return Ident(local);
}
__attribute__((noinline))
void Func2(char *x) {
*x = 1;
}
int main(int argc, char **argv) {
Func2(Func1());
return 0;
}
/* { dg-output "AddressSanitizer: stack-use-after-return on address 0x\[0-9a-f\]+\[^\n\r]*(\n|\r\n|\r)" } */
/* { dg-output "WRITE of size 1 at .* thread T0.*" } */
/* { dg-output " #0.*(Func2)?.*pr64820.(c:21)?.*" } */
/* { dg-output "is located in stack of thread T0 at offset.*" } */
/* { dg-output "\'local\' <== Memory access at offset 32 is inside this variable" } */