aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTodd Kjos <tkjos@google.com>2020-08-05 16:56:22 +0000
committerTodd Kjos <tkjos@google.com>2020-08-05 16:57:47 +0000
commit750930c292ae8f10b9bdffffc9af05b08da3f424 (patch)
treec98684ce1e74fee9e22057f53725ceda9bd3a7df
parentfc75d2f6e5349be5ca01b356a0bed13bf42d1555 (diff)
Revert "Revert "ANDROID: ASoC: compress: fix unsigned integer overflow check""ASB-2020-08-05_12-5.4
This reverts commit d75ddc924b992ca5ee3eaf375d216f563333f000. 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: I23b7b804e468f18de804de33a510ba11744810b6 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 14a0674d2f7d..1afa06b80f06 100644
--- a/sound/core/compress_offload.c
+++ b/sound/core/compress_offload.c
@@ -528,7 +528,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;