Skip to content

Commit 099e57f

Browse files
tiwaigregkh
authored andcommitted
ALSA: core: Fix unexpected error at replacing user TLV
commit 88c54cdf61f508ebcf8da2d819f5dfc03e954d1d upstream. When user tries to replace the user-defined control TLV, the kernel checks the change of its content via memcmp(). The problem is that the kernel passes the return value from memcmp() as is. memcmp() gives a non-zero negative value depending on the comparison result, and this shall be recognized as an error code. The patch covers that corner-case, return 1 properly for the changed TLV. Fixes: 8aa9b58 ("[ALSA] Control API - more robust TLV implementation") Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 07051c1 commit 099e57f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

sound/core/control.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ static int snd_ctl_elem_user_tlv(struct snd_kcontrol *kcontrol,
11261126
mutex_lock(&ue->card->user_ctl_lock);
11271127
change = ue->tlv_data_size != size;
11281128
if (!change)
1129-
change = memcmp(ue->tlv_data, new_data, size);
1129+
change = memcmp(ue->tlv_data, new_data, size) != 0;
11301130
kfree(ue->tlv_data);
11311131
ue->tlv_data = new_data;
11321132
ue->tlv_data_size = size;

0 commit comments

Comments
 (0)