7b245a0266
* Fix hwasan global overflow. Crash found with https://source.android.com/devices/tech/debug/hwasan but also detectable by regular ASan. Here's an ASan crash: ==215690==ERROR: AddressSanitizer: global-buffer-overflow on address 0x55d90f8da140 at pc 0x55d90f8b7503 bp 0x7ffd3dae6100 sp 0x7ffd3dae60f8 READ of size 4 at 0x55d90f8da140 thread T0 #0 0x55d90f8b7502 in word /tmp/awk/lex.c:496 #1 0x55d90f8b939f in yylex /tmp/awk/lex.c:191 #2 0x55d90f894ab9 in yyparse /tmp/awk/awkgram.tab.c:2366 #3 0x55d90f89edc2 in main /tmp/awk/main.c:216 #4 0x7ff263a78bba in __libc_start_main ../csu/libc-start.c:308 #5 0x55d90f8945a9 in _start (/tmp/awk/a.out+0x115a9) 0x55d90f8da141 is located 0 bytes to the right of global variable 'infunc' defined in 'awkgram.y:35:6' (0x55d90f8da140) of size 1 SUMMARY: AddressSanitizer: global-buffer-overflow /tmp/awk/lex.c:496 in word Shadow bytes around the buggy address: 0x0abba1f133d0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0abba1f133e0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0abba1f133f0: f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 f9 0x0abba1f13400: f9 f9 f9 f9 00 00 00 00 00 00 00 00 00 00 00 00 0x0abba1f13410: 00 f9 f9 f9 f9 f9 f9 f9 00 f9 f9 f9 f9 f9 f9 f9 =>0x0abba1f13420: 04 f9 f9 f9 f9 f9 f9 f9[01]f9 f9 f9 f9 f9 f9 f9 0x0abba1f13430: 00 f9 f9 f9 f9 f9 f9 f9 00 f9 f9 f9 f9 f9 f9 f9 0x0abba1f13440: 00 00 00 00 00 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 0x0abba1f13450: f9 f9 f9 f9 00 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 0x0abba1f13460: f9 f9 f9 f9 04 f9 f9 f9 f9 f9 f9 f9 04 f9 f9 f9 0x0abba1f13470: f9 f9 f9 f9 00 f9 f9 f9 f9 f9 f9 f9 00 f9 f9 f9 And here's the stack trace from hwasan: Stack Trace: RELADDR FUNCTION FILE:LINE 00000000000168d4 word external/one-true-awk/lex.c:496:18 000000000002d1ec yyparse y.tab.c:2460:16 000000000001c82c main external/one-true-awk/main.c:179:2 00000000000b41a0 __libc_init bionic/libc/bionic/libc_init_dynamic.cpp:151:8 As it says, we're doing a 4-byte read from a 1-byte global. `infunc` is declared as an int but defined as a bool. Signed-off-by: Evgenii Stepanov <eugenis@google.com> * Add ASan cflags to makefile. They're not used by default, but this way they're easily to hand next time they're wanted.
123 lines
3.8 KiB
Makefile
123 lines
3.8 KiB
Makefile
# /****************************************************************
|
|
# Copyright (C) Lucent Technologies 1997
|
|
# All Rights Reserved
|
|
#
|
|
# Permission to use, copy, modify, and distribute this software and
|
|
# its documentation for any purpose and without fee is hereby
|
|
# granted, provided that the above copyright notice appear in all
|
|
# copies and that both that the copyright notice and this
|
|
# permission notice and warranty disclaimer appear in supporting
|
|
# documentation, and that the name Lucent Technologies or any of
|
|
# its entities not be used in advertising or publicity pertaining
|
|
# to distribution of the software without specific, written prior
|
|
# permission.
|
|
#
|
|
# LUCENT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS.
|
|
# IN NO EVENT SHALL LUCENT OR ANY OF ITS ENTITIES BE LIABLE FOR ANY
|
|
# SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER
|
|
# IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
# ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
|
|
# THIS SOFTWARE.
|
|
# ****************************************************************/
|
|
|
|
CFLAGS = -fsanitize=address -O1 -g -fno-omit-frame-pointer -fno-optimize-sibling-calls
|
|
CFLAGS = -g
|
|
CFLAGS =
|
|
CFLAGS = -O2
|
|
|
|
# compiler options
|
|
#CC = gcc -Wall -g -Wwrite-strings
|
|
#CC = gcc -O4 -Wall -pedantic -fno-strict-aliasing
|
|
#CC = gcc -fprofile-arcs -ftest-coverage # then gcov f1.c; cat f1.c.gcov
|
|
HOSTCC = gcc -g -Wall -pedantic -Wcast-qual
|
|
CC = $(HOSTCC) # change this is cross-compiling.
|
|
|
|
# yacc options. pick one; this varies a lot by system.
|
|
#YFLAGS = -d -S
|
|
YACC = bison -d
|
|
#YACC = yacc -d
|
|
# -S uses sprintf in yacc parser instead of sprint
|
|
|
|
OFILES = b.o main.o parse.o proctab.o tran.o lib.o run.o lex.o
|
|
|
|
SOURCE = awk.h ytab.c ytab.h proto.h awkgram.y lex.c b.c main.c \
|
|
maketab.c parse.c lib.c run.c tran.c proctab.c
|
|
|
|
LISTING = awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
|
|
lib.c run.c tran.c
|
|
|
|
SHIP = README LICENSE FIXES $(SOURCE) ytab[ch].bak makefile \
|
|
awk.1
|
|
|
|
a.out: ytab.o $(OFILES)
|
|
$(CC) $(CFLAGS) ytab.o $(OFILES) $(ALLOC) -lm
|
|
|
|
$(OFILES): awk.h ytab.h proto.h
|
|
|
|
# Clear dependency for parallel build: (make -j)
|
|
# Depending if we used yacc or bison we can be generating different names
|
|
# ({awkgram,y}.tab.{c,h}) so try to move both. We could be using -p to
|
|
# specify the output prefix, but older yacc's don't support it.
|
|
ytab.c ytab.h: awk.h proto.h awkgram.y
|
|
$(YACC) $(YFLAGS) awkgram.y
|
|
-@for i in c h; do for j in awkgram y; do \
|
|
if [ -f "$$j.tab.$$i" ]; then mv $$j.tab.$$i ytab.$$i; fi; \
|
|
done; done
|
|
|
|
ytab.h: ytab.c
|
|
|
|
proctab.c: maketab
|
|
./maketab ytab.h >proctab.c
|
|
|
|
maketab: ytab.h maketab.c
|
|
$(HOSTCC) $(CFLAGS) maketab.c -o maketab
|
|
|
|
bundle:
|
|
@cp ytab.h ytabh.bak
|
|
@cp ytab.c ytabc.bak
|
|
@bundle $(SHIP)
|
|
|
|
tar:
|
|
@cp ytab.h ytabh.bak
|
|
@cp ytab.c ytabc.bak
|
|
@bundle $(SHIP) >awk.shar
|
|
@tar cf awk.tar $(SHIP)
|
|
gzip awk.tar
|
|
ls -l awk.tar.gz
|
|
@zip awk.zip $(SHIP)
|
|
ls -l awk.zip
|
|
|
|
gitadd:
|
|
git add README LICENSE FIXES \
|
|
awk.h proto.h awkgram.y lex.c b.c main.c maketab.c parse.c \
|
|
lib.c run.c tran.c \
|
|
makefile awk.1 testdir
|
|
|
|
gitpush:
|
|
# only do this once:
|
|
# git remote add origin https://github.com/onetrueawk/awk.git
|
|
git push -u origin master
|
|
|
|
names:
|
|
@echo $(LISTING)
|
|
|
|
test check:
|
|
./REGRESS
|
|
|
|
clean: testclean
|
|
rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda # proctab.c
|
|
|
|
cleaner: testclean
|
|
rm -f a.out *.o *.obj maketab maketab.exe *.bb *.bbg *.da *.gcov *.gcno *.gcda proctab.c ytab*
|
|
|
|
# This is a bit of a band-aid until we can invest some more time
|
|
# in the test suite.
|
|
testclean:
|
|
cd testdir; rm -fr arnold-fixes beebe echo foo* \
|
|
glop glop1 glop2 lilly.diff tempbig tempsmall time
|
|
|
|
# For the habits of GNU maintainers:
|
|
distclean: clean
|