diff options
| author | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2024-07-26 16:10:46 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2024-07-29 13:36:37 +0100 |
| commit | dcb6631d05152930e2ea70fd2abfd811b0e970b5 (patch) | |
| tree | 1c8cc0dff7fbbf878051371f19c90d0355cd0fc0 /sound | |
| parent | 6801ac36f25690e14955f7f9eace1eaa29edbdd0 (diff) | |
| download | linux-stable-dcb6631d05152930e2ea70fd2abfd811b0e970b5.tar.gz linux-stable-dcb6631d05152930e2ea70fd2abfd811b0e970b5.tar.bz2 linux-stable-dcb6631d05152930e2ea70fd2abfd811b0e970b5.zip | |
ASoC: codecs: wsa884x: Correct Soundwire ports mask
Device has up to WSA884X_MAX_SWR_PORTS number of ports and the array
assigned to prop.sink_dpn_prop has 0..WSA884X_MAX_SWR_PORTS-1 elements.
On the other hand, GENMASK(high, low) creates an inclusive mask between
<high, low>, so we need the mask from 0 up to WSA884X_MAX_SWR_PORTS-1.
Theoretically, too wide mask could cause an out of bounds read in
sdw_get_slave_dpn_prop() in stream.c, however only in the case of buggy
driver, e.g. adding incorrect number of ports via
sdw_stream_add_slave().
Fixes: aa21a7d4f68a ("ASoC: codecs: wsa884x: Add WSA884x family of speakers")
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://patch.msgid.link/20240726-asoc-wcd-wsa-swr-ports-genmask-v1-6-d4d7a8b56f05@linaro.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/soc/codecs/wsa884x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/wsa884x.c b/sound/soc/codecs/wsa884x.c index d17ae17b2938..89eb5e03a617 100644 --- a/sound/soc/codecs/wsa884x.c +++ b/sound/soc/codecs/wsa884x.c @@ -1895,7 +1895,7 @@ static int wsa884x_probe(struct sdw_slave *pdev, WSA884X_MAX_SWR_PORTS)) dev_dbg(dev, "Static Port mapping not specified\n"); - pdev->prop.sink_ports = GENMASK(WSA884X_MAX_SWR_PORTS, 0); + pdev->prop.sink_ports = GENMASK(WSA884X_MAX_SWR_PORTS - 1, 0); pdev->prop.simple_clk_stop_capable = true; pdev->prop.sink_dpn_prop = wsa884x_sink_dpn_prop; pdev->prop.scp_int1_mask = SDW_SCP_INT1_BUS_CLASH | SDW_SCP_INT1_PARITY; |