evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "dsp: codecs: fix range check for audio buffer copying"

Browse source
This commit is contained in:
Linux Build Service Account 2019-03-11 05:47:59 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0bc8b59292
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/misc/qcom/qdsp6v2/audio_utils.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2010-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2010-2016, 2019 The Linux Foundation. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -879,8 +879,7 @@ ssize_t audio_in_write(struct file *file,
__func__, audio->ac->session); __func__, audio->ac->session);
} }
} }
xfer = (count > (audio->pcm_cfg.buffer_size)) ? xfer = (count > size) ? size : count;
(audio->pcm_cfg.buffer_size) : count;
if (copy_from_user(cpy_ptr, buf, xfer)) { if (copy_from_user(cpy_ptr, buf, xfer)) {
rc = -EFAULT; rc = -EFAULT;