d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

awk: Fix subobject out-of-bounds access

Browse Source 
When matching a regex with ^, it would attempt to access
gototab[NSTATES][NCHARS+2], and therefore access the state for the \002
character instead. This change is required to run awk under CHERI (with
sub-object bounds) and when running with UBSan instrumentation.

This was committed upstream as cbf924342b

Found by:	CHERI (with subobject bounds enabled)
Obtained from:	CheriBSD
Reviewed By:	imp
Differential Revision: https://reviews.freebsd.org/D26509
This commit is contained in:
Alex Richardson 2020-09-21 19:03:07 +00:00
parent 52664466c7
commit ae692c42cb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/one-true-awk/awk.h
View File

@ -218,6 +218,8 @@ extern int pairstack[], paircnt;
#define NCHARS (256+3) /* 256 handles 8-bit chars; 128 does 7-bit */
/* watch out in match(), etc. */
#define NSTATES 32
#define HAT (NCHARS+2) /* matches ^ in regular expr */
/* NCHARS is 2**n */
typedef struct rrow {
long ltype; /* long avoids pointer warnings on 64-bit */
@ -230,7 +232,7 @@ typedef struct rrow {
} rrow;
typedef struct fa {
uschar gototab[NSTATES][NCHARS];
uschar gototab[NSTATES][HAT + 1];
uschar out[NSTATES];
uschar *restr;
int *posns[NSTATES];

2
contrib/one-true-awk/b.c
View File

@ -37,8 +37,6 @@ __FBSDID("$FreeBSD$");
#include "awk.h"
#include "ytab.h"
#define HAT (NCHARS+2) /* matches ^ in regular expr */
/* NCHARS is 2**n */
#define MAXLIN 22
#define type(v) (v)->nobj /* badly overloaded here */