ASoC: cs35l41: Add one more variable in the debug log
Subsystems (3)
PATCH 1/2 ASoC: cs35l41: Add one more variable in the debug log
otp_map[].size is a key variable to compute the value of otp_val and to update the bit_offset, it is helpful to debug if could put it in the debug log.
--- sound/soc/codecs/cs35l41-lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/codecs/cs35l41-lib.c +2 -2
@@ -822,8 +822,8 @@ int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap) word_offset = otp_map_match->word_offset;for (i =0 ; i < otp_map_match->num_elements; i++) { -dev_dbg (dev,"bitoffset= %d, word_offset=%d, bit_sum mod 32=%d\n" , - bit_offset, word_offset, bit_sum %32 ); +dev_dbg (dev,"bitoffset= %d, word_offset=%d, bit_sum mod 32=%d otp_map[i].size = %d\n" , + bit_offset, word_offset, bit_sum %32 , otp_map[i].size);if (bit_offset + otp_map[i].size -1 >=32 ) { otp_val = (otp_mem[word_offset] &GENMASK (31 , bit_offset)) >> bit_offset;
Signature · 1 line
2.25.1
PATCH 2/2 ASoC: cs35l41: Fix a shift-out-of-bounds warning found by UBSAN
We enabled UBSAN in the ubuntu kernel, and the cs35l41 driver triggers a warning calltrace like below:
cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: bitoffset= 8, word_offset=23, bit_sum mod 32=0, otp_map[i].size = 24 cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: bitoffset= 0, word_offset=24, bit_sum mod 32=24, otp_map[i].size = 0
================================================================================
UBSAN: shift-out-of-bounds in linux-kernel-src/sound/soc/codecs/cs35l41-lib.c:836:8 shift exponent 64 is too large for 64-bit type 'long unsigned int' CPU: 10 PID: 595 Comm: systemd-udevd Not tainted 5.15.0-23-generic #23 Hardware name: LENOVO \x02MFG_IN_GO/\x02MFG_IN_GO, BIOS N3GET19W (1.00 ) 03/11/2022 Call Trace: <TASK> show_stack+0x52/0x58 dump_stack_lvl+0x4a/0x5f dump_stack+0x10/0x12 ubsan_epilogue+0x9/0x45 __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef ? regmap_unlock_mutex+0xe/0x10 cs35l41_otp_unpack.cold+0x1c6/0x2b2 [snd_soc_cs35l41_lib] cs35l41_hda_probe+0x24f/0x33a [snd_hda_scodec_cs35l41] cs35l41_hda_i2c_probe+0x65/0x90 [snd_hda_scodec_cs35l41_i2c]
When both bitoffset and otp_map[i].size are 0, the line 836 will result in GENMASK(-1, 0), this triggers the shift-out-of-bounds calltrace.
Here add a checking, if both bitoffset and otp_map[i].size are 0, do not run GENMASK() and directly set otp_val to 0, this will not bring any function change on the driver but could avoid the calltrace.
--- sound/soc/codecs/cs35l41-lib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
sound/soc/codecs/cs35l41-lib.c +4 -2
@@ -831,12 +831,14 @@ int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap) GENMASK(bit_offset + otp_map[i].size - 33, 0)) << (32 - bit_offset); bit_offset += otp_map[i].size -32 ; - }else { + }else if (bit_offset + otp_map[i].size -1 >=0 ) { otp_val = (otp_mem[word_offset] &GENMASK (bit_offset + otp_map[i].size -1 , bit_offset) ) >> bit_offset; bit_offset += otp_map[i].size; - } + }else /* both bit_offset and otp_map[i].size are 0 */ + otp_val =0 ; + bit_sum += otp_map[i].size;if (bit_offset ==32 ) {
Signature · 1 line
2.25.1
Re: [PATCH 2/2] ASoC: cs35l41: Fix a shift-out-of-bounds warning found by UBSAN
Quoted 22 lines · Hui Wang
We enabled UBSAN in the ubuntu kernel, and the cs35l41 driver triggers a warning calltrace like below:
cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: bitoffset= 8, word_offset=23,
bit_summod 32=0, otp_map[i].size = 24 cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: bitoffset= 0, word_offset=24,bit_summod 32=24, otp_map[i].size = 0
================================================================================UBSAN: shift-out-of-bounds in linux-kernel-src/sound/soc/codecs/cs35l41-lib.c:836:8 shift exponent 64 is too large for 64-bit type 'long unsigned int' CPU: 10 PID: 595 Comm: systemd-udevd Not tainted 5.15.0-23-generic #23 Hardware name: LENOVO \x02MFG_IN_GO/\x02MFG_IN_GO, BIOS N3GET19W (1.00 ) 03/11/2022 Call Trace: <TASK> show_stack+0x52/0x58 dump_stack_lvl+0x4a/0x5f dump_stack+0x10/0x12 ubsan_epilogue+0x9/0x45 __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef ? regmap_unlock_mutex+0xe/0x10 cs35l41_otp_unpack.cold+0x1c6/0x2b2 [snd_soc_cs35l41_lib] cs35l41_hda_probe+0x24f/0x33a [snd_hda_scodec_cs35l41] cs35l41_hda_i2c_probe+0x65/0x90 [snd_hda_scodec_cs35l41_i2c]
Quoted 7 lines
When both bitoffset and otp_map[i].size are 0, the line 836 will result in
GENMASK(-1, 0), this triggers the shift-out-of-bounds calltrace.Here add a checking, if both bitoffset and otp_map[i].size are 0, do not run
GENMASK()and directly setotp_valto 0, this will not bring any function change on the driver but could avoid the calltrace.
Here would be better to return an error and fail the probe, as this is a not expected case.
Quoted 27 lines
Signed-off-by Hui Wang <[email protected]>--- sound/soc/codecs/cs35l41-lib.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)sound/soc/codecs/cs35l41-lib.c +4
-2@@ -831,12 +831,14 @@ int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap) GENMASK(bit_offset + otp_map[i].size - 33, 0)) << (32 - bit_offset); bit_offset += otp_map[i].size -32 ; - }else { + }else if (bit_offset + otp_map[i].size -1 >=0 ) { otp_val = (otp_mem[word_offset] &GENMASK (bit_offset + otp_map[i].size -1 , bit_offset) ) >> bit_offset; bit_offset += otp_map[i].size; - } + }else /* both bit_offset and otp_map[i].size are 0 */ + otp_val =0 ; + bit_sum += otp_map[i].size;if (bit_offset ==32 ) {
Re: [PATCH 2/2] ASoC: cs35l41: Fix a shift-out-of-bounds warning found by UBSAN
Quoted 28 lines · Lucas tanure
Quoted 27 lines · Hui Wang
We enabled UBSAN in the ubuntu kernel, and the cs35l41 driver triggers a warning calltrace like below:
cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: bitoffset= 8, word_offset=23,
bit_summod 32=0, otp_map[i].size = 24 cs35l41-hda i2c-CSC3551:00-cs35l41-hda.0: bitoffset= 0, word_offset=24,bit_summod 32=24, otp_map[i].size = 0
================================================================================UBSAN: shift-out-of-bounds in linux-kernel-src/sound/soc/codecs/cs35l41-lib.c:836:8 shift exponent 64 is too large for 64-bit type 'long unsigned int' CPU: 10 PID: 595 Comm: systemd-udevd Not tainted 5.15.0-23-generic #23 Hardware name: LENOVO \x02MFG_IN_GO/\x02MFG_IN_GO, BIOS N3GET19W (1.00 ) 03/11/2022 Call Trace: <TASK> show_stack+0x52/0x58 dump_stack_lvl+0x4a/0x5f dump_stack+0x10/0x12 ubsan_epilogue+0x9/0x45 __ubsan_handle_shift_out_of_bounds.cold+0x61/0xef ? regmap_unlock_mutex+0xe/0x10 cs35l41_otp_unpack.cold+0x1c6/0x2b2 [snd_soc_cs35l41_lib] cs35l41_hda_probe+0x24f/0x33a [snd_hda_scodec_cs35l41] cs35l41_hda_i2c_probe+0x65/0x90 [snd_hda_scodec_cs35l41_i2c]When both bitoffset and otp_map[i].size are 0, the line 836 will result in
GENMASK(-1, 0), this triggers the shift-out-of-bounds calltrace.
Quoted 6 lines
Quoted 3 lines
Here add a checking, if both bitoffset and otp_map[i].size are 0, do not run
GENMASK()and directly setotp_valto 0, this will not bring any function change on the driver but could avoid the calltrace.Here would be better to return an error and fail the probe, as this is a not expected case.
OK, got it. And I re-read the code and found It is the last entry in the array to introduce this call-trace, the CS35L41_NUM_OTP_ELEM is defined to be 100, but otp_map_1/2[] only defines 99 elements, so the last entry in the array are {0, 0, 0}, that is why the driver gets a 0 for map[i].size.
I will remove the CS35L41_NUM_OTP_ELEM and use ARRAY_SIZE() in the v2 patch.
Thanks,
Hui.
Quoted 28 lines
Quoted 27 lines
Signed-off-by Hui Wang <[email protected]>---
sound/soc/codecs/cs35l41-lib.c| 6 ++++--1 file changed, 4 insertions(+), 2 deletions(-)sound/soc/codecs/cs35l41-lib.c +0
-0@@ -831,12 +831,14 @@ int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap)
GENMASK(bit_offset + otp_map[i].size - 33, 0)) << (32 -bit_offset);
bit_offset+= otp_map[i].size - 32;
- } else {
+ } else if (bit_offset+ otp_map[i].size - 1 >= 0) {otp_val= (otp_mem[word_offset] &GENMASK(bit_offset + otp_map[i].size - 1, bit_offset)) >>bit_offset;
bit_offset+= otp_map[i].size;
- }
+ } else /* bothbit_offsetand otp_map[i].size are 0 */ +otp_val= 0;
+
bit_sum+= otp_map[i].size;
if (bit_offset== 32) {
Quoted 5 lines · Hui Wang
otp_map[].size is a key variable to compute the value of
otp_valand to update thebit_offset, it is helpful to debug if could put it in the debug log.Signed-off-by Hui Wang <[email protected]>
Quoted 19 lines
--- sound/soc/codecs/cs35l41-lib.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)sound/soc/codecs/cs35l41-lib.c +2
-2@@ -822,8 +822,8 @@ int cs35l41_otp_unpack(struct device *dev, struct regmap *regmap) word_offset = otp_map_match->word_offset;for (i =0 ; i < otp_map_match->num_elements; i++) { -dev_dbg (dev,"bitoffset= %d, word_offset=%d, bit_sum mod 32=%d\n" , - bit_offset, word_offset, bit_sum %32 ); +dev_dbg (dev,"bitoffset= %d, word_offset=%d, bit_sum mod 32=%d otp_map[i].size = %d\n" , + bit_offset, word_offset, bit_sum %32 , otp_map[i].size);if (bit_offset + otp_map[i].size -1 >=32 ) { otp_val = (otp_mem[word_offset] &GENMASK (31 , bit_offset)) >> bit_offset;
Mark Brown
maintainerQuoted 5 lines · Hui Wang
otp_map[].size is a key variable to compute the value of
otp_valand to update thebit_offset, it is helpful to debug if could put it in the debug log.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: cs35l41: Add one more variable in the debug log
commit: c598ccfbeb26cb9452f99e7beb92ef779dcb16b1
[2/2] ASoC: cs35l41: Fix a shift-out-of-bounds warning found by UBSAN
commit: 0b3d5d2e358ca6772fc3662fca27acb12a682fbfAll being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark