aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Kjos <tkjos@google.com>2020-08-05 16:49:42 +0000
committerTodd Kjos <tkjos@google.com>2020-08-05 20:06:23 +0000
commit15415a6a2ac9ad310292a0f9e4bb332d99ce0632 (patch)
treeaeb12e37d92d7012f1ec23a60c9093e60f9edbf1
parent4467f1150461c2c0760496ec5d33c2381fe5e932 (diff)
Revert "Revert "ANDROID: ASoC: compress: fix unsigned integer overflow check""ASB-2020-08-05_mainline
This reverts commit e00793e8f0a8a9cfc3eaf36179de1cefbfaf2486. Reason for revert: Subsequent to this commit, the identical patch came from upstream: commit d3645b055399 ("ASoC: compress: fix unsigned integer overflow check"). So this revert undid the upstream patch. Change-Id: Ib33548fd77225f730f056a8a489a5e70155242ac Signed-off-by: Todd Kjos <tkjos@google.com>
-rw-r--r--sound/core/compress_offload.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/core/compress_offload.c b/sound/core/compress_offload.c
index f225a89f822f..0e53f6f31916 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -570,7 +570,7 @@ static int snd_compress_check_input(struct snd_compr_params *params)
{
/* first let's check the buffer parameter's */
if (params->buffer.fragment_size == 0 ||
- params->buffer.fragments > INT_MAX / params->buffer.fragment_size ||
+ params->buffer.fragments > U32_MAX / params->buffer.fragment_size ||
params->buffer.fragments == 0)
return -EINVAL;