Merge pull request #7957 from PeterKietzmann/pr_ipv6_hdr_fix

miri64 · web-flow · commit d2ccbc85b0a2 · 2017-11-10T11:07:29.000+01:00
net/ipv6/hdr: fix issue #5944
diff --git a/sys/include/net/ipv6/hdr.h b/sys/include/net/ipv6/hdr.h
@@ -288,7 +288,7 @@ static inline uint32_t ipv6_hdr_get_fl(const ipv6_hdr_t *hdr)
 static inline uint16_t ipv6_hdr_inet_csum(uint16_t sum, ipv6_hdr_t *hdr,
                                           uint8_t prot_num, uint16_t len)
 {
-    if ((sum + len + prot_num) > 0xffff) {
+    if (((uint32_t)sum + len + prot_num) > 0xffff) {
         /* increment by one for overflow to keep it as 1's complement sum */
         sum++;
     }

Original file line number	Diff line number	Diff line change
`@@ -288,7 +288,7 @@ static inline uint32_t ipv6_hdr_get_fl(const ipv6_hdr_t *hdr)`
`288`	`288`	`static inline uint16_t ipv6_hdr_inet_csum(uint16_t sum, ipv6_hdr_t *hdr,`
`289`	`289`	`uint8_t prot_num, uint16_t len)`
`290`	`290`	`{`
`291`		`- if ((sum + len + prot_num) > 0xffff) {`
	`291`	`+ if (((uint32_t)sum + len + prot_num) > 0xffff) {`
`292`	`292`	`/* increment by one for overflow to keep it as 1's complement sum */`
`293`	`293`	`sum++;`
`294`	`294`	`}`