Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd8d41ed authored by Siena Richard's avatar Siena Richard Committed by Gerrit - the friendly Code Review server
Browse files

ASoC: msm: qdsp6v2: return error when copy from userspace fails 



A copy_from_user is not always expected to succeed. Therefore, check
for an error before operating on the buffer post copy.

CRs-Fixed: 1116070
Change-Id: I21032719e6e85f280ca0cda875c84ac8dee8916b
Signed-off-by: default avatarSiena Richard <sienar@codeaurora.org>
parent c4b8f734

sound/soc/msm/qdsp6v2/msm-pcm-voip-v2.c

+11 −6
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 * 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
@@ -814,20 +814,25 @@ static int msm_pcm_playback_copy(struct snd_pcm_substream *substream, int a, 
			if (prtd->mode == MODE_PCM) {

				ret = copy_from_user(&buf_node->frame.voc_pkt,

							buf, count);

				if (ret) {

					pr_err("%s: copy from user failed %d\n",

					       __func__, ret);

					return -EFAULT;

				}

				buf_node->frame.pktlen = count;

			} else {

				ret = copy_from_user(&buf_node->frame,

							buf, count);

				if (buf_node->frame.pktlen >= count)

					buf_node->frame.pktlen = count -

					(sizeof(buf_node->frame.frm_hdr) +

					 sizeof(buf_node->frame.pktlen));

			}

				if (ret) {

					pr_err("%s: copy from user failed %d\n",

					       __func__, ret);

					return -EFAULT;

				}

				if (buf_node->frame.pktlen >= count)

					buf_node->frame.pktlen = count -

					(sizeof(buf_node->frame.frm_hdr) +

					 sizeof(buf_node->frame.pktlen));

			}

			spin_lock_irqsave(&prtd->dsp_lock, dsp_flags);

			list_add_tail(&buf_node->list, &prtd->in_queue);

			spin_unlock_irqrestore(&prtd->dsp_lock, dsp_flags);