Skip to contentSkip to conversation

lib/ts_bm: fix integer overflow in pattern length calculation

PATCH Superseded Josh Law 1 participant 2 messages Mar 8 Library code

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Josh Law

author
#0 lore raw

PATCH 1/2 lib/ts_bm: fix integer overflow in pattern length calculation

The ts_bm algorithm computes the required allocation size by multiplying the pattern length by the size of an integer. If the pattern length is sufficiently large, this can overflow the 32-bit unsigned int before it is widened to size_t. This could result in an undersized allocation and a subsequent heap buffer overflow when copying the pattern.

Fix this by explicitly checking that the length does not exceed the maximum safe threshold before calculating the buffer sizes.

---
 lib/ts_bm.c | 3 +++
 1 file changed, 3 insertions(+)
lib/ts_bm.c +3 -0
index eed5967238c5..01ea0a93cf6e 100644
@@ -166,6 +166,9 @@ static struct ts_config *bm_init(const void *pattern, unsigned int len,
 	unsigned int prefix_tbl_len = len * sizeof(unsigned int);
 	size_t priv_size = sizeof(*bm) + len + prefix_tbl_len;
 
+	if (unlikely(len == 0 || len > (UINT_MAX - sizeof(*bm)) / (sizeof(unsigned int) + 1)))
+		return ERR_PTR(-EINVAL);
+
 	conf = alloc_ts_config(priv_size, gfp_mask);
 	if (IS_ERR(conf))
 		return conf;
Signature · 1 line
2.43.0
author
#1 lore raw

PATCH 2/2 lib/ts_kmp: fix integer overflow in pattern length calculation

The ts_kmp algorithm computes the required allocation size by multiplying the pattern length by the size of an integer. If the pattern length is sufficiently large, this can overflow the 32-bit unsigned int before it is widened to size_t. This could result in an undersized allocation and a subsequent heap buffer overflow when copying the pattern.

Fix this by explicitly checking that the length does not exceed the maximum safe threshold before calculating the buffer sizes.

---
 lib/ts_kmp.c | 3 +++
 1 file changed, 3 insertions(+)
lib/ts_kmp.c +3 -0
index 5520dc28255a..e07f5e80d076 100644
@@ -97,6 +97,9 @@ static struct ts_config *kmp_init(const void *pattern, unsigned int len,
 	unsigned int prefix_tbl_len = len * sizeof(unsigned int);
 	size_t priv_size = sizeof(*kmp) + len + prefix_tbl_len;
 
+	if (unlikely(len == 0 || len > (UINT_MAX - sizeof(*kmp)) / (sizeof(unsigned int) + 1)))
+		return ERR_PTR(-EINVAL);
+
 	conf = alloc_ts_config(priv_size, gfp_mask);
 	if (IS_ERR(conf))
 		return conf;
Signature · 1 line
2.43.0