From: Lucas De Marchi <lucas.demarchi@intel.com>
Date: Tue, 10 Feb 2015 12:46:26 +0000 (-0200)
Subject: libkmod: use helper function to check for overflow
X-Git-Tag: v20~43
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6684102cd3c371c2c977ffffe8859e93f909c680;p=thirdparty%2Fkmod.git

libkmod: use helper function to check for overflow
---

diff --git a/libkmod/libkmod-elf.c b/libkmod/libkmod-elf.c
index 8a8a73d9..4af829ec 100644
--- a/libkmod/libkmod-elf.c
+++ b/libkmod/libkmod-elf.c
@@ -250,8 +250,8 @@ static inline int elf_get_section_info(const struct kmod_elf *elf, uint16_t idx,
 	}
 #undef READV
 
-	min_size = *offset + *size;
-	if (ULLONG_MAX - *offset < *size || min_size > elf->size) {
+	if (addu64_overflow(*offset, *size, &min_size)
+	    || min_size > elf->size) {
 		ELFDBG(elf, "out-of-bounds: %"PRIu64" >= %"PRIu64" (ELF size)\n",
 		       min_size, elf->size);
 		return -EINVAL;