Unverified Commit 70041000 authored by Stephan Gerhold's avatar Stephan Gerhold Committed by Mark Brown
Browse files

ASoC: qcom: lpass: Fix out-of-bounds DAI ID lookup 



The "dai_id" given into LPAIF_INTFDMA_REG(...) is already the real
DAI ID, not an index into v->dai_driver. Looking it up again seems
entirely redundant.

For IPQ806x (and SC7180 since commit 09a4f6f5
("ASoC: dt-bindings: lpass: Fix and common up lpass dai ids") this is
now often an out-of-bounds read because the indexes in the "dai_driver"
array no longer match the actual DAI ID.

Cc: Srinivasa Rao Mandadapu <srivasam@codeaurora.org>
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Fixes: 7cb37b7b ("ASoC: qcom: Add support for lpass hdmi driver")
Signed-off-by: default avatarStephan Gerhold <stephan@gerhold.net>
Reviewed-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20210125104442.135899-1-stephan@gerhold.net


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 339f6c73

sound/soc/qcom/lpass-lpaif-reg.h

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ 
#define	LPAIF_WRDMAPERCNT_REG(v, chan)	LPAIF_WRDMA_REG_ADDR(v, 0x14, (chan))



#define LPAIF_INTFDMA_REG(v, chan, reg, dai_id)  \

		((v->dai_driver[dai_id].id ==  LPASS_DP_RX) ? \

	((dai_id ==  LPASS_DP_RX) ? \

		LPAIF_HDMI_RDMA##reg##_REG(v, chan) : \

		 LPAIF_RDMA##reg##_REG(v, chan))