Merge pull request #223 from Zadamsa/fix-ipv6-ext-headers-parsing

SiskaPavel · web-flow · commit ebb8d77d7fee · 2024-10-07T08:44:28.000+02:00
Fix IPv6 header parsing
diff --git a/input/parser.cpp b/input/parser.cpp
@@ -357,7 +357,7 @@ uint16_t skip_ipv6_ext_hdrs(const u_char *data_ptr, uint16_t data_len, Packet *p
 
    /* Skip/parse extension headers... */
    while (1) {
-      if ((int)sizeof(struct ip6_ext) > data_len - hdrs_len) {
+      if (hdrs_len > data_len || sizeof(struct ip6_ext) > data_len - hdrs_len) {
          throw "Parser detected malformed packet";
       }
       if (next_hdr == IPPROTO_HOPOPTS ||

Original file line number	Diff line number	Diff line change
`@@ -357,7 +357,7 @@ uint16_t skip_ipv6_ext_hdrs(const u_char data_ptr, uint16_t data_len, Packet p`
`357`	`357`
`358`	`358`	`/* Skip/parse extension headers... */`
`359`	`359`	`while (1) {`
`360`		`- if ((int)sizeof(struct ip6_ext) > data_len - hdrs_len) {`
	`360`	`+ if (hdrs_len > data_len \|\| sizeof(struct ip6_ext) > data_len - hdrs_len) {`
`361`	`361`	`throw "Parser detected malformed packet";`
`362`	`362`	`}`
`363`	`363`	`if (next_hdr == IPPROTO_HOPOPTS \|\|`