mirrors/tcpdump
0
0
Fork 0
mirror of https://github.com/the-tcpdump-group/tcpdump.git synced 2024-11-23 18:14:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

vsock: Use ND_TCHECK_LEN() for a bounds check

Browse Source 
Moreover:
Define ND_LONGJMP_FROM_TCHECK.
Remove a ndo_ll_hdr_len increment in a truncation case.
Remove a useless variable.
This commit is contained in:
Francois-Xavier Le Bail 2020-11-20 15:13:52 +01:00
parent de27d59e78
commit 85b72a1f30
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
print-vsock.c
View File

@ -30,6 +30,7 @@
#include "netdissect-stdinc.h"
#include <stddef.h>
#define ND_LONGJMP_FROM_TCHECK
#include "netdissect.h"
#include "extract.h"
@ -248,15 +249,9 @@ void
vsock_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h,
const u_char *cp)
{
u_int caplen = h->caplen;
ndo->ndo_protocol = "vsock";
if (caplen < sizeof(struct af_vsockmon_hdr)) {
nd_print_trunc(ndo);
ndo->ndo_ll_hdr_len += caplen;
return;
}
ND_TCHECK_LEN(cp, sizeof(struct af_vsockmon_hdr));
ndo->ndo_ll_hdr_len += sizeof(struct af_vsockmon_hdr);
vsock_hdr_print(ndo, cp, caplen);
vsock_hdr_print(ndo, cp, h->caplen);
}