aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrinivas Kandagatla <srinivas.kandagatla@linaro.org>2019-05-22 17:24:43 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-07-14 08:11:05 +0200
commit6b1ce3971e05de54ae531484e3d93c2992d1bab9 (patch)
treee2e612a752dc5f0738442c100e3fb01272ee79c0
parent6be857082611ee432125ee473973e9b6d9619f4d (diff)
downloadlinux-stable-6b1ce3971e05de54ae531484e3d93c2992d1bab9.tar.gz
soundwire: stream: fix out of boundary access on port properties
[ Upstream commit 03ecad90d3798be11b033248bbd4bbff4425a1c7 ] Assigning local iterator to array element and using it again for indexing would cross the array boundary. Fix this by directly referring array element without using the local variable. Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/soundwire/stream.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/soundwire/stream.c b/drivers/soundwire/stream.c
index e5c7e1ef63188..907a548645b75 100644
--- a/drivers/soundwire/stream.c
+++ b/drivers/soundwire/stream.c
@@ -1236,9 +1236,7 @@ struct sdw_dpn_prop *sdw_get_slave_dpn_prop(struct sdw_slave *slave,
}
for (i = 0; i < num_ports; i++) {
- dpn_prop = &dpn_prop[i];
-
- if (dpn_prop->num == port_num)
+ if (dpn_prop[i].num == port_num)
return &dpn_prop[i];
}