Unverified Commit 23f787a4 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!6388 [sync] PR-6202: ALSA: usb-audio: fix null pointer dereference on pointer cs_desc 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/6202 
 
PR sync from: Liu Shixin <liushixin2@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/7GWLTCARPXHDN7GAD3I6GD4PLHJCYOPI/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9FNFQ 
 
Link:https://gitee.com/openeuler/kernel/pulls/6388

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 7bfbfe63 b22e2283

sound/usb/clock.c

+6 −0
Original line number Diff line number Diff line
@@ -618,11 +618,17 @@ static int set_sample_rate_v2v3(struct snd_usb_audio *chip, int iface, 
		struct uac3_clock_source_descriptor *cs_desc;



		cs_desc = snd_usb_find_clock_source_v3(chip->ctrl_intf, clock);

		if (!cs_desc)

			return 0;



		bmControls = le32_to_cpu(cs_desc->bmControls);

	} else {

		struct uac_clock_source_descriptor *cs_desc;



		cs_desc = snd_usb_find_clock_source(chip->ctrl_intf, clock);

		if (!cs_desc)

			return 0;



		bmControls = cs_desc->bmControls;

	}