diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 2002-07-12 13:31:44 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 2002-07-12 13:31:44 +0000 |
| commit | a9a49f739b3253eaf0c401a2507889ef81f5daac (patch) | |
| tree | 7a4a83254b8f1282f8dc1a46909e603c002bc998 /contrib/tcpdump/interface.h | |
| parent | bf8ae2ab7c59d83df729943aeb3e675a35ff7d51 (diff) | |
| download | src-a9a49f739b3253eaf0c401a2507889ef81f5daac.tar.gz src-a9a49f739b3253eaf0c401a2507889ef81f5daac.zip | |
MFC 1.6: Correct a buffer overflow when handling malformed NFS
packets.
Notes
Notes:
svn path=/releng/4.4/; revision=99870
Diffstat (limited to 'contrib/tcpdump/interface.h')
| -rw-r--r-- | contrib/tcpdump/interface.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/contrib/tcpdump/interface.h b/contrib/tcpdump/interface.h index 2459764d7b69..af069cb2f2dc 100644 --- a/contrib/tcpdump/interface.h +++ b/contrib/tcpdump/interface.h @@ -132,8 +132,16 @@ extern int snaplen; extern const u_char *packetp; extern const u_char *snapend; -/* True if "l" bytes of "var" were captured */ -#define TTEST2(var, l) ((u_char *)&(var) <= snapend - (l)) +/* + * True if "l" bytes of "var" were captured. + * + * The "snapend - (l) <= snapend" checks to make sure "l" isn't so large + * that "snapend - (l)" underflows. + * + * The check is for <= rather than < because "l" might be 0. + */ +#define TTEST2(var, l) (snapend - (l) <= snapend && \ + (const u_char *)&(var) <= snapend - (l)) /* True if "var" was captured */ #define TTEST(var) TTEST2(var, sizeof(var)) |