Skip to content

ASoC: rt1011: fix KASAN out-of-bounds bug in find_next_bit() #2179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kv2019i merged 1 commit into from
Jun 15, 2020
Merged

ASoC: rt1011: fix KASAN out-of-bounds bug in find_next_bit() #2179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions sound/soc/codecs/rt1011.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1849,13 +1849,13 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,

/* Rx slot configuration */
rx_slotnum = hweight_long(rx_mask);
first_bit = find_next_bit((unsigned long *)&rx_mask, 32, 0);
if (rx_slotnum > 1 || rx_slotnum == 0) {
if (rx_slotnum > 1 || !rx_slotnum) {
ret = -EINVAL;
dev_dbg(component->dev, "too many rx slots or zero slot\n");
dev_err(component->dev, "too many rx slots or zero slot\n");
goto _set_tdm_err_;
}

first_bit = __ffs(rx_mask);
switch (first_bit) {
case 0:
case 2:
Expand Down Expand Up @@ -1892,11 +1892,17 @@ static int rt1011_set_tdm_slot(struct snd_soc_dai *dai,

/* Tx slot configuration */
tx_slotnum = hweight_long(tx_mask);
first_bit = find_next_bit((unsigned long *)&tx_mask, 32, 0);
last_bit = find_last_bit((unsigned long *)&tx_mask, 32);
if (tx_slotnum > 2 || (last_bit-first_bit) > 1) {
if (tx_slotnum > 2 || !tx_slotnum) {
ret = -EINVAL;
dev_dbg(component->dev, "too many tx slots or tx slot location error\n");
dev_err(component->dev, "too many tx slots or zero slot\n");
goto _set_tdm_err_;
}

first_bit = __ffs(tx_mask);
last_bit = __fls(tx_mask);
if (last_bit - first_bit > 1) {
ret = -EINVAL;
dev_err(component->dev, "tx slot location error\n");
goto _set_tdm_err_;
}

Expand Down