Skip to content

Commit aebb181

Browse files
krzkbroonie
authored andcommitted
ASoC: codecs: wcd937x-sdw: Correct Soundwire ports mask
Device has up to WCD937X_MAX_TX_SWR_PORTS (or WCD937X_MAX_SWR_PORTS for sink) number of ports and the array assigned to prop.src_dpn_prop and prop.sink_dpn_prop has 0..WCD937X_MAX_TX_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 WCD937X_MAX_TX_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: c99a515 ("ASoC: codecs: wcd937x-sdw: add SoundWire driver") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://patch.msgid.link/20240726-asoc-wcd-wsa-swr-ports-genmask-v1-1-d4d7a8b56f05@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 8400291 commit aebb181

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/codecs/wcd937x-sdw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1049,7 +1049,7 @@ static int wcd9370_probe(struct sdw_slave *pdev,
10491049
pdev->prop.lane_control_support = true;
10501050
pdev->prop.simple_clk_stop_capable = true;
10511051
if (wcd->is_tx) {
1052-
pdev->prop.source_ports = GENMASK(WCD937X_MAX_TX_SWR_PORTS, 0);
1052+
pdev->prop.source_ports = GENMASK(WCD937X_MAX_TX_SWR_PORTS - 1, 0);
10531053
pdev->prop.src_dpn_prop = wcd937x_dpn_prop;
10541054
wcd->ch_info = &wcd937x_sdw_tx_ch_info[0];
10551055
pdev->prop.wake_capable = true;
@@ -1062,7 +1062,7 @@ static int wcd9370_probe(struct sdw_slave *pdev,
10621062
/* Start in cache-only until device is enumerated */
10631063
regcache_cache_only(wcd->regmap, true);
10641064
} else {
1065-
pdev->prop.sink_ports = GENMASK(WCD937X_MAX_SWR_PORTS, 0);
1065+
pdev->prop.sink_ports = GENMASK(WCD937X_MAX_SWR_PORTS - 1, 0);
10661066
pdev->prop.sink_dpn_prop = wcd937x_dpn_prop;
10671067
wcd->ch_info = &wcd937x_sdw_rx_ch_info[0];
10681068
}

0 commit comments

Comments
 (0)