Skip to content

Commit 7211ddd

Browse files
mcrmcr
committed
Merge remote-tracking branch 'bpf/tcpdump-4.7' into tcpdump-4.7
2 parents 4f824b2 + 8f01704 commit 7211ddd

File tree

14 files changed

+155
-44
lines changed

14 files changed

+155
-44
lines changed

‎CHANGES

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
Monday March. 11, 2015 guy@alum.mit.edu
1+
Friday April 10, 2015 guy@alum.mit.edu
2+
Summary for 4.7.4 tcpdump release
3+
RPKI to Router Protocol: Fix Segmentation Faults and other problems
4+
RPKI to Router Protocol: print strings with fn_printn()
5+
wb: fix some bounds checks
6+
7+
Wednesday March 11, 2015 mcr@sandelman.ca
28
Summary for 4.7.3 tcpdump release
39
Capsicum fixes for FreeBSD 10
410

5-
Monday March. 10, 2015 guy@alum.mit.edu
11+
Tuesday March 10, 2015 mcr@sandelman.ca
612
Summary for 4.7.2 tcpdump release
713
DCCP: update Packet Types with RFC4340/IANA names
814
fixes for CVE-2015-0261: IPv6 mobility header check issue

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.7.3
1+
4.7.4

‎netdissect.h

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,9 @@ extern const char *tok2strbuf(const struct tok *, const char *, u_int,
8181
char *buf, size_t bufsize);
8282

8383
/* tok2str is deprecated */
84-
extern const char *tok2str(const struct tok *, const char *, int);
85-
extern char *bittok2str(const struct tok *, const char *, int);
86-
extern char *bittok2str_nosep(const struct tok *, const char *, int);
84+
extern const char *tok2str(const struct tok *, const char *, u_int);
85+
extern char *bittok2str(const struct tok *, const char *, u_int);
86+
extern char *bittok2str_nosep(const struct tok *, const char *, u_int);
8787

8888

8989
typedef struct netdissect_options netdissect_options;
@@ -293,7 +293,6 @@ extern void relts_print(netdissect_options *, int);
293293
extern int fn_print(netdissect_options *, const u_char *, const u_char *);
294294
extern int fn_printn(netdissect_options *, const u_char *, u_int, const u_char *);
295295
extern int fn_printzp(netdissect_options *, const u_char *, u_int, const u_char *);
296-
extern const char *tok2str(const struct tok *, const char *, int);
297296

298297
/*
299298
* Flags for txtproto_print().

‎print-isoclns.c

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3093,14 +3093,18 @@ osi_print_cksum(netdissect_options *ndo,
30933093
ND_PRINT((ndo, "(unverified)"));
30943094
} else {
30953095
unsigned char *truncated = "trunc";
3096-
//printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen);
3097-
//ND_TCHECK2(pptr, checksum_offset+length);
3096+
#if 0
3097+
printf("\nosi_print_cksum: %p %u %u %u\n", pptr, checksum_offset, length, ndo->ndo_snaplen);
3098+
ND_TCHECK2(pptr, checksum_offset+length);
3099+
#endif
30983100
calculated_checksum = create_osi_cksum(pptr, checksum_offset, length);
30993101
if (checksum == calculated_checksum) {
31003102
ND_PRINT((ndo, " (correct)"));
31013103
} else {
31023104
truncated = "incorrect";
3103-
//trunc:
3105+
#if 0
3106+
trunc:
3107+
#endif
31043108
ND_PRINT((ndo, " (%s should be 0x%04x)", truncated, calculated_checksum));
31053109
}
31063110
}

‎print-rpki-rtr.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
178178
pdu_header = (rpki_rtr_pdu *)tptr;
179179
pdu_type = pdu_header->pdu_type;
180180
pdu_len = EXTRACT_32BITS(pdu_header->length);
181-
ND_TCHECK2(tptr, pdu_len);
181+
ND_TCHECK2(*tptr, pdu_len);
182182
hexdump = FALSE;
183183

184184
ND_PRINT((ndo, "%sRPKI-RTRv%u, %s PDU (%u), length: %u",
@@ -251,10 +251,10 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
251251
{
252252
rpki_rtr_pdu_error_report *pdu;
253253
u_int encapsulated_pdu_length, text_length, tlen, error_code;
254-
u_char buf[80];
255254

256255
pdu = (rpki_rtr_pdu_error_report *)tptr;
257256
encapsulated_pdu_length = EXTRACT_32BITS(pdu->encapsulated_pdu_length);
257+
ND_TCHECK2(*tptr, encapsulated_pdu_length);
258258
tlen = pdu_len;
259259

260260
error_code = EXTRACT_16BITS(pdu->pdu_header.u.error_code);
@@ -287,11 +287,10 @@ rpki_rtr_pdu_print (netdissect_options *ndo, const u_char *tptr, u_int indent)
287287
tptr += 4;
288288
tlen -= 4;
289289
}
290-
printf("text_length: %u tlen %u\n", text_length, tlen);
290+
ND_TCHECK2(*tptr, text_length);
291291
if (text_length && (text_length <= tlen )) {
292-
memcpy(buf, tptr, min(sizeof(buf)-1, text_length));
293-
buf[text_length] = '\0';
294-
ND_PRINT((ndo, "%sError text: %s", indent_string(indent+2), buf));
292+
ND_PRINT((ndo, "%sError text: ", indent_string(indent+2)));
293+
fn_printn(ndo, tptr, text_length, ndo->ndo_snapend);
295294
}
296295
}
297296
break;
@@ -337,13 +336,13 @@ rpki_rtr_print(netdissect_options *ndo, register const u_char *pptr, register u_
337336
pdu_header = (rpki_rtr_pdu *)tptr;
338337
pdu_type = pdu_header->pdu_type;
339338
pdu_len = EXTRACT_32BITS(pdu_header->length);
339+
ND_TCHECK2(*tptr, pdu_len);
340340

341341
/* infinite loop check */
342342
if (!pdu_type || !pdu_len) {
343343
break;
344344
}
345345

346-
ND_TCHECK2(*tptr, pdu_len);
347346
if (tlen < pdu_len) {
348347
goto trunc;
349348
}

‎print-wb.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ wb_id(netdissect_options *ndo,
202202
len -= sizeof(*io) * nid;
203203
io = (struct id_off *)(id + 1);
204204
cp = (char *)(io + nid);
205-
if (!ND_TTEST2(cp, len)) {
205+
if (ND_TTEST2(cp, len)) {
206206
ND_PRINT((ndo, "\""));
207207
fn_print(ndo, (u_char *)cp, (u_char *)cp + len);
208208
ND_PRINT((ndo, "\""));
@@ -267,7 +267,7 @@ wb_prep(netdissect_options *ndo,
267267
}
268268
n = EXTRACT_32BITS(&prep->pp_n);
269269
ps = (const struct pgstate *)(prep + 1);
270-
while (--n >= 0 && !ND_TTEST(*ps)) {
270+
while (--n >= 0 && ND_TTEST(*ps)) {
271271
const struct id_off *io, *ie;
272272
char c = '<';
273273

@@ -276,7 +276,7 @@ wb_prep(netdissect_options *ndo,
276276
ipaddr_string(ndo, &ps->page.p_sid),
277277
EXTRACT_32BITS(&ps->page.p_uid)));
278278
io = (struct id_off *)(ps + 1);
279-
for (ie = io + ps->nid; io < ie && !ND_TTEST(*io); ++io) {
279+
for (ie = io + ps->nid; io < ie && ND_TTEST(*io); ++io) {
280280
ND_PRINT((ndo, "%c%s:%u", c, ipaddr_string(ndo, &io->id),
281281
EXTRACT_32BITS(&io->off)));
282282
c = ',';

‎tcpdump.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2220,9 +2220,6 @@ static void
22202220
dump_packet_and_trunc(u_char *user, const struct pcap_pkthdr *h, const u_char *sp)
22212221
{
22222222
struct dump_info *dump_info;
2223-
#ifdef HAVE_CAPSICUM
2224-
cap_rights_t rights;
2225-
#endif
22262223

22272224
++packets_captured;
22282225

‎tests/kday2.out

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
2222
IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
2323
204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0
2424
IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
25-
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc
25+
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x8900), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
26+
RPKI-RTRv177, Unknown PDU (100), length: 60
27+
0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70
28+
0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
29+
0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297
30+
0x0030: afc4 39a4 0db9 7aa5 6873 33e8
31+
RPKI-RTRv65, Error Report PDU (10), length: 21
32+
Error code: Unknown (66), Encapsulated PDU length: 37|trunc
2633
[|RPKI-RTR]
2734
EXIT CODE 00000100

‎tests/kday3.out

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,35 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
77
IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
88
204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x7767), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0
99
IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
10-
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x0cf1), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2381534627 ecr 3084508609], length 347|trunc|trunc|trunc
10+
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x0cf1), seq 3589495407:3589495754, ack 370428050, win 1040, options [nop,nop,TS val 2381534627 ecr 3084508609], length 347
11+
RPKI-RTRv177, Unknown PDU (100), length: 60
12+
0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70
13+
0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
14+
0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297
15+
0x0030: afc4 39a4 0db9 7aa5 6873 33e8
16+
RPKI-RTRv65, Error Report PDU (10), length: 66|trunc
17+
RPKI-RTRv115, Error Report PDU (10), length: 66
18+
Error code: Unknown (66), Encapsulated PDU length: 12
19+
-----encapsulated PDU-----|trunc|trunc
20+
[|RPKI-RTR]
1121
IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52)
1222
204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 0, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0
1323
IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->451a)!)
1424
204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
1525
IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
1626
204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
1727
IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
18-
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc
28+
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xa6b3), seq 0:347, ack 1, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
29+
RPKI-RTRv177, Unknown PDU (100), length: 60
30+
0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70
31+
0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
32+
0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297
33+
0x0030: afc4 39a4 0db9 7aa5 6873 33e8
34+
RPKI-RTRv65, Error Report PDU (10), length: 66
35+
Error code: Unknown (66), Encapsulated PDU length: 37
36+
-----encapsulated PDU-----|trunc|trunc
37+
RPKI-RTRv9, Unknown PDU (51), length: 32
38+
0x0000: 0933 84cc 0000 0020 9f00 1649 d1c8 546c
39+
0x0010: ff13 1980 100f fc85 8b00 0055 0000 0101
1940
[|RPKI-RTR]
2041
EXIT CODE 00000100

‎tests/kday4.out

Lines changed: 35 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,18 @@ IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52,
66
IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52)
77
204.9.54.80.55936 > 204.9.55.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x725a), ack 3589495407, win 1040, options [nop,nop,TS val 647770294 ecr 2364779354], length 0
88
IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
9-
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc
9+
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xcd5f), seq 3589495407:3589495754, ack 370436242, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
10+
RPKI-RTRv177, Unknown PDU (100), length: 60
11+
0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70
12+
0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
13+
0x0020: b36d cc11 3abf 1291 f106 4ede 58f4 6297
14+
0x0030: afc4 39a4 0db9 7aa5 6873 33e8
15+
RPKI-RTRv65, Error Report PDU (10), length: 66
16+
Error code: Unknown (66), Encapsulated PDU length: 37
17+
-----encapsulated PDU-----|trunc|trunc
18+
RPKI-RTRv115, Error Report PDU (10), length: 66
19+
Error code: Unknown (66), Encapsulated PDU length: 12
20+
-----encapsulated PDU-----|trunc|trunc
1021
[|RPKI-RTR]
1122
IP (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 52)
1223
204.9.51.132.50079 > 204.9.54.80.22: Flags [.], cksum 0x8611 (incorrect -> 0xa678), ack 1819218606, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 0
@@ -15,14 +26,35 @@ IP (tos 0x10, ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52,
1526
IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
1627
204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 3587398274, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
1728
IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
18-
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa70), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc
29+
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0xfa70), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
30+
RPKI-RTRv197, Unknown PDU (100), length: 60
31+
0x0000: c564 003c 0000 003c 0000 00ff ff1f 1b70
32+
0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
33+
0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297
34+
0x0030: afc4 39a4 0db9 7aa5 6873 33e8
35+
RPKI-RTRv65, Error Report PDU (10), length: 66
36+
Error code: Unknown (66), Encapsulated PDU length: 37
37+
-----encapsulated PDU-----|trunc|trunc
38+
RPKI-RTRv115, Error Report PDU (10), length: 66
39+
Error code: Unknown (66), Encapsulated PDU length: 12
40+
-----encapsulated PDU-----|trunc|trunc
41+
[|RPKI-RTR]
1942
IP truncated-ip - 768 bytes missing! (tos 0x10, ttl 62, id 64806, offset 0, flags [DF], proto TCP (6), length 820, bad cksum 3da6 (->3aa6)!)
2043
204.9.51.132.50079 > 204.9.54.80.22: Flags [.], seq 0:768, ack 1, win 4094, options [nop,nop,TS val 941371775 ecr 4294967242], length 768
2144
IP (tos 0x6,ECT(0), ttl 62, id 62920, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 4504 (->4524)!)
2245
204.9.51.132.50079 > 204.243.53.80.22: Flags [.], cksum 0x858b (incorrect -> 0x85a1), ack 1, win 4092, options [nop,nop,TS val 941371913 ecr 1340592084], length 0
2346
IP (tos 0x0, ttl 64, id 63178, offset 0, flags [DF], proto TCP (6), length 52, bad cksum 3e8c (->438c)!)
2447
204.9.64.80.55936 > 204.9.40.10.443: Flags [.], cksum 0x0594 (incorrect -> 0x8d67), ack 1, win 1040, options [nop,nop,TS val 647770294 ecr 2364773722], length 0
2548
IP (tos 0x0, ttl 64, id 36752, offset 0, flags [DF], proto TCP (6), length 399, bad cksum a46b (->a474)!)
26-
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347|trunc|trunc|trunc
49+
204.0.55.10.323 > 204.9.54.80.55936: Flags [P.], cksum 0xc9b6 (incorrect -> 0x3f28), seq 0:347, ack 4294959105, win 1040, options [nop,nop,TS val 2364757411 ecr 3084508609], length 347
50+
RPKI-RTRv177, Unknown PDU (100), length: 60
51+
0x0000: b164 003c 0000 003c 0000 00ff ff1f 1b70
52+
0x0010: f857 ee68 4dfd 4d5f d9bd c709 30ac 8176
53+
0x0020: b36d cc11 3abf 1291 f106 4ede 61f4 6297
54+
0x0030: afc4 39a4 0db9 7aa5 6873 33e8
55+
RPKI-RTRv65, Error Report PDU (10), length: 66
56+
Error code: Unknown (66), Encapsulated PDU length: 100
57+
Error text: ^@^@^@M-^?M-^?^_^[pM-xWM-nhMM-}M_M-YM-=M-G^I0M-,M-^AvM-3mM-L^Q:M-?^RM-^QM-q^FNM-^aM-tbM-^WM-/M-D9M-$^MM-9zM-%hs3M-hA^J^@B^@^@^@B^@^@^@%M-Dz^HM-i^RM-^DM-5M-^\M->0H^H^@E^P^@4M-}&@^@>^F
58+
RPKI-RTRv115, Error Report PDU (10), length: 66|trunc
2759
[|RPKI-RTR]
2860
EXIT CODE 00000100

0 commit comments

Comments
 (0)