commit | 51da3011f51a774d07456396cecdf90eb6cdebaa | [log] [tgz] |
---|---|---|
author | Linux Build Service Account <lnxbuild@localhost> | Mon Mar 17 19:02:33 2014 -0700 |
committer | Gerrit - the friendly Code Review server <code-review@localhost> | Mon Mar 17 19:02:33 2014 -0700 |
tree | 6f405c258059302c29372243eafb8a1bb42aa0d3 | |
parent | 1b1dca2c82d33a7c0803de26d7911b21c10c8ab4 [diff] | |
parent | 731dfb6e499d813a412e7cbb9c075ff19dd5101a [diff] |
Merge "ASoC: msm: Null dereference check added"
diff --git a/sound/soc/msm/qdsp6v2/q6asm.c b/sound/soc/msm/qdsp6v2/q6asm.c index badc3c3..48bf2f4 100644 --- a/sound/soc/msm/qdsp6v2/q6asm.c +++ b/sound/soc/msm/qdsp6v2/q6asm.c
@@ -3748,6 +3748,11 @@ mutex_lock(&port->lock); dsp_buf = port->dsp_buf; + if (port->buf == NULL) { + pr_err("%s buf is NULL\n", __func__); + mutex_unlock(&port->lock); + return -EINVAL; + } ab = &port->buf[dsp_buf]; pr_debug("%s:session[%d]dsp-buf[%d][%p]cpu_buf[%d][%p]\n",