2021-02-27 00:17:30

by Colin King

Subject: [PATCH] ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits

From: Colin Ian King <[email protected]>

Currently the mask operation on variable conf is just 3 bits so
the switch statement case value of 8 is unreachable dead code.
The function daio_mgr_dao_init can be passed a 4 bit value,
function dao_rsc_init calls it with conf set to:

conf = (desc->msr & 0x7) | (desc->passthru << 3);

so clearly when desc->passthru is set to 1 then conf can be
at least 8.

Fix this by changing the mask to 0xf.

Fixes: 8cc72361481f ("ALSA: SB X-Fi driver merge")
Signed-off-by: Colin Ian King <[email protected]>
---
sound/pci/ctxfi/cthw20k2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/pci/ctxfi/cthw20k2.c b/sound/pci/ctxfi/cthw20k2.c
index a855fb8c58bd..55af8ef29838 100644
--- a/sound/pci/ctxfi/cthw20k2.c
+++ b/sound/pci/ctxfi/cthw20k2.c
@@ -991,7 +991,7 @@ static int daio_mgr_dao_init(void *blk, unsigned int idx, unsigned int conf)

if (idx < 4) {
/* S/PDIF output */
- switch ((conf & 0x7)) {
+ switch ((conf & 0xf)) {
case 1:
set_field(&ctl->txctl[idx], ATXCTL_NUC, 0);
break;
--
2.30.0

2021-02-28 08:17:16

by Takashi Iwai

Subject: Re: [PATCH] ALSA: ctxfi: cthw20k2: fix mask on conf to allow 4 bits

On Sat, 27 Feb 2021 01:15:27 +0100,
Colin King wrote:
>
> From: Colin Ian King <[email protected]>
>
> Currently the mask operation on variable conf is just 3 bits so
> the switch statement case value of 8 is unreachable dead code.
> The function daio_mgr_dao_init can be passed a 4 bit value,
> function dao_rsc_init calls it with conf set to:
>
> conf = (desc->msr & 0x7) | (desc->passthru << 3);
>
> so clearly when desc->passthru is set to 1 then conf can be
> at least 8.
>
> Fix this by changing the mask to 0xf.
>
> Fixes: 8cc72361481f ("ALSA: SB X-Fi driver merge")
> Signed-off-by: Colin Ian King <[email protected]>

Applied, thanks.


Takashi