adafruit-mirror/zephyr
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 9

usb: device: fix unaligned memory access in Audio class

Browse source 
Use UNALIGNED_*, sys_get_* to fix unaligned memory
access issues

Signed-off-by: ZhongYao Luo <LuoZhongYao@gmail.com>
This commit is contained in:
ZhongYao Luo 2024-10-07 17:01:41 +08:00 committed by Anas Nashif
parent 04c70d681e
commit 188a42b117
3 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
samples/subsys/usb/audio/headphones_microphone/src/main.c
View file

@ -53,7 +53,7 @@ static void feature_update(const struct device *dev,
case USB_AUDIO_FU_MUTE_CONTROL: case USB_AUDIO_FU_MUTE_CONTROL:
break; break;
case USB_AUDIO_FU_VOLUME_CONTROL: case USB_AUDIO_FU_VOLUME_CONTROL:
volume = *((int16_t *)(evt->val)); volume = UNALIGNED_GET((int16_t *)evt->val);
LOG_INF("set volume: %d", volume); LOG_INF("set volume: %d", volume);
break; break;
default: default:

2
samples/subsys/usb/audio/headset/src/main.c
View file

@ -51,7 +51,7 @@ static void feature_update(const struct device *dev,
case USB_AUDIO_FU_MUTE_CONTROL: case USB_AUDIO_FU_MUTE_CONTROL:
break; break;
case USB_AUDIO_FU_VOLUME_CONTROL: case USB_AUDIO_FU_VOLUME_CONTROL:
volume = *((int16_t *)(evt->val)); volume = UNALIGNED_GET((int16_t *)evt->val);
LOG_INF("set volume: %d", volume); LOG_INF("set volume: %d", volume);
break; break;
default: default:

7
subsys/usb/device/class/audio/audio.c
View file

@ -577,7 +577,7 @@ static int handle_fu_volume_req(struct usb_audio_dev_data *audio_dev_data,
return -EINVAL; return -EINVAL;
} }
if (setup->bRequest == USB_AUDIO_SET_CUR) { if (setup->bRequest == USB_AUDIO_SET_CUR) {
target_vol = *((int16_t *)*data); target_vol = sys_get_le16(*data);
if (!IN_RANGE(target_vol, audio_dev_data->volumes.volume_min, if (!IN_RANGE(target_vol, audio_dev_data->volumes.volume_min,
audio_dev_data->volumes.volume_max)) { audio_dev_data->volumes.volume_max)) {
LOG_ERR("Volume out of range: %d", target_vol); LOG_ERR("Volume out of range: %d", target_vol);
@ -587,15 +587,16 @@ static int handle_fu_volume_req(struct usb_audio_dev_data *audio_dev_data,
target_vol = ROUND_UP(target_vol, target_vol = ROUND_UP(target_vol,
audio_dev_data->volumes.volume_res); audio_dev_data->volumes.volume_res);
} }
UNALIGNED_PUT(target_vol, (int16_t *)control_val);
evt->val = control_val; evt->val = control_val;
evt->val_len = *len; evt->val_len = *len;
*((int16_t *)evt->val) = sys_le16_to_cpu(target_vol);
return 0; return 0;
} }
} else { } else {
if (setup->bRequest == USB_AUDIO_GET_CUR) { if (setup->bRequest == USB_AUDIO_GET_CUR) {
*len = LEN(ch_cnt, VOLUME); *len = LEN(ch_cnt, VOLUME);
temp_vol = sys_cpu_to_le16(*(int16_t *)control_val); temp_vol = sys_cpu_to_le16(UNALIGNED_GET((int16_t *)control_val));
memcpy(*data, &temp_vol, *len); memcpy(*data, &temp_vol, *len);
return 0; return 0;
} else if (setup->bRequest == USB_AUDIO_GET_MIN) { } else if (setup->bRequest == USB_AUDIO_GET_MIN) {