Skip to content

Commit 74a7997

Browse files
krzkbroonie
authored andcommitted
ASoC: codecs: wcd939x-sdw: Correct Soundwire ports mask
Device has up to WCD939X_MAX_TX_SWR_PORTS (or WCD939X_MAX_RX_SWR_PORTS for sink) number of ports and the array assigned to prop.src_dpn_prop and prop.sink_dpn_prop has 0..WCD939X_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 WCD939X_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: be2af39 ("ASoC: codecs: Add WCD939x Soundwire devices driver") Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> Link: https://patch.msgid.link/20240726-asoc-wcd-wsa-swr-ports-genmask-v1-3-d4d7a8b56f05@linaro.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 3f6fb03 commit 74a7997

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

sound/soc/codecs/wcd939x-sdw.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1453,12 +1453,12 @@ static int wcd9390_probe(struct sdw_slave *pdev, const struct sdw_device_id *id)
14531453
pdev->prop.lane_control_support = true;
14541454
pdev->prop.simple_clk_stop_capable = true;
14551455
if (wcd->is_tx) {
1456-
pdev->prop.source_ports = GENMASK(WCD939X_MAX_TX_SWR_PORTS, 0);
1456+
pdev->prop.source_ports = GENMASK(WCD939X_MAX_TX_SWR_PORTS - 1, 0);
14571457
pdev->prop.src_dpn_prop = wcd939x_tx_dpn_prop;
14581458
wcd->ch_info = &wcd939x_sdw_tx_ch_info[0];
14591459
pdev->prop.wake_capable = true;
14601460
} else {
1461-
pdev->prop.sink_ports = GENMASK(WCD939X_MAX_RX_SWR_PORTS, 0);
1461+
pdev->prop.sink_ports = GENMASK(WCD939X_MAX_RX_SWR_PORTS - 1, 0);
14621462
pdev->prop.sink_dpn_prop = wcd939x_rx_dpn_prop;
14631463
wcd->ch_info = &wcd939x_sdw_rx_ch_info[0];
14641464
}

0 commit comments

Comments
 (0)