Skip to content

Commit

Permalink
OSPF6: Fix an undefined behavior
Browse files Browse the repository at this point in the history
Handle ls_length shorter than sizeof(lsa_hdr) in the same way as OSPF.

Use a u_int32 to hold a loop variable initialized with GET_BE_U_4.

print-ospf6.c:815:46: runtime error: signed integer overflow:
-2147483648 - 1 cannot be represented in type 'int'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior print-ospf6.c:817:46

[Part of the PR the-tcpdump-group#1012]

(cherry picked from commit 7f3c090)
  • Loading branch information
fenner authored and fxlb committed Oct 12, 2023
1 parent e736b63 commit d164863
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 2 deletions.
13 changes: 11 additions & 2 deletions print-ospf6.c
Original file line number Diff line number Diff line change
Expand Up @@ -388,14 +388,23 @@ static int
ospf6_print_lshdr(netdissect_options *ndo,
const struct lsa6_hdr *lshp, const u_char *dataend)
{
u_int ls_length;

if ((const u_char *)(lshp + 1) > dataend)
goto trunc;

ls_length = GET_BE_U_2(lshp->ls_length);
if (ls_length < sizeof(struct lsa_hdr)) {
ND_PRINT("\n\t Bogus length %u < header (%zu)", ls_length,
sizeof(struct lsa_hdr));
goto trunc;
}

ND_PRINT("\n\t Advertising Router %s, seq 0x%08x, age %us, length %zu",
GET_IPADDR_STRING(lshp->ls_router),
GET_BE_U_4(lshp->ls_seq),
GET_BE_U_2(lshp->ls_age),
GET_BE_U_2(lshp->ls_length)-sizeof(struct lsa6_hdr));
ls_length-sizeof(struct lsa6_hdr));

ospf6_print_ls_type(ndo, GET_BE_U_2(lshp->ls_type),
&lshp->ls_stateid);
Expand Down Expand Up @@ -734,7 +743,7 @@ ospf6_decode_v3(netdissect_options *ndo,
const struct lsr6 *lsrp;
const struct lsa6_hdr *lshp;
const struct lsa6 *lsap;
int i;
uint32_t i;

switch (GET_U_1(op->ospf6_type)) {

Expand Down
1 change: 1 addition & 0 deletions tests/TESTLIST
Original file line number Diff line number Diff line change
Expand Up @@ -854,3 +854,4 @@ lwres_with_extra lwres_with_extra.pcap lwres_with_extra.out
ip-snmp-leftshift-unsigned ip-snmp-leftshift-unsigned.pcap ip-snmp-leftshift-unsigned.out
ip6-snmp-oid-unsigned ip6-snmp-oid-unsigned.pcap ip6-snmp-oid-unsigned.out
lwres-pointer-arithmetic-ub lwres-pointer-arithmetic-ub.pcap lwres-pointer-arithmetic-ub.out
ospf-signed-integer-ubsan ospf-signed-integer-ubsan.pcap ospf-signed-integer-ubsan.out -vv
3 changes: 3 additions & 0 deletions tests/ospf-signed-integer-ubsan.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
1 15:39:26.444985 IP6 (class 0xe0, hlim 1, next-header AH (51) payload length: 532) fe80::1 > fe80::2: AH(length=4(24-bytes),spi=0x00000100,seq=0x1e,icv=0x0a6ab0b271917e05f7a01c58): OSPFv3, LS-Update, length 508
Router-ID 1.1.1.108, Area 11.234.210.1, Instance 1
Bogus length 0 < header (20) [|ospf3]
Binary file added tests/ospf-signed-integer-ubsan.pcap
Binary file not shown.

0 comments on commit d164863

Please sign in to comment.