ANDROID: fix up abi issue with struct snd_pcm_runtime
A portion of the fix for CVE-2022-1048, commit0f6947f5f5
("ALSA: pcm: Fix races among concurrent hw_params and hw_free calls"), caused an ABI break by adding a new field to struct snd_pcm_runtime. Because we have to keep this new addition, it is safe to move it to the end of the structure because this is only ever created by the sound core, and referenced as a pointer everywhere else. This does require a .xml update also to handle the increased structure size: Leaf changes summary: 1 artifact changed Changed leaf types summary: 1 leaf type changed Removed/Changed/Added functions summary: 0 Removed, 0 Changed, 0 Added function Removed/Changed/Added variables summary: 0 Removed, 0 Changed, 0 Added variable 'struct snd_pcm_runtime at pcm.h:344:1' changed: type size changed from 6144 to 6528 (in bits) 1 data member insertion: 'mutex buffer_mutex', at offset 6144 (in bits) at pcm.h:432:1 120 impacted interfaces Bug: 161946584 Fixes:0f6947f5f5
("ALSA: pcm: Fix races among concurrent hw_params and hw_free calls") Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I525799616e06c1d2c5513821a3361e99dcb7e553
This commit is contained in:
File diff suppressed because it is too large
Load Diff
@@ -398,7 +398,6 @@ struct snd_pcm_runtime {
|
||||
wait_queue_head_t tsleep; /* transfer sleep */
|
||||
struct fasync_struct *fasync;
|
||||
bool stop_operating; /* sync_stop will be called */
|
||||
struct mutex buffer_mutex; /* protect for buffer changes */
|
||||
|
||||
/* -- private section -- */
|
||||
void *private_data;
|
||||
@@ -429,6 +428,9 @@ struct snd_pcm_runtime {
|
||||
/* -- OSS things -- */
|
||||
struct snd_pcm_oss_runtime oss;
|
||||
#endif
|
||||
#ifndef __GENKSYMS__
|
||||
struct mutex buffer_mutex; /* protect for buffer changes */
|
||||
#endif
|
||||
};
|
||||
|
||||
struct snd_pcm_group { /* keep linked substreams */
|
||||
|
Reference in New Issue
Block a user