Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3fc41476 authored by Colin Ian King's avatar Colin Ian King Committed by Takashi Iwai
Browse files

ALSA: xen-front: fix unintention integer overflow on left shifts 



Shifting the integer value 1 is evaluated using 32-bit
arithmetic and then used in an expression that expects a 64-bit
value, so there is potentially an integer overflow. Fix this
by using the BIT_ULL macro to perform the shift.

[ Note: as of the time being, no actual integer overflow hits because
  all values are less than 32bit, not including the extended 3-byte or
  DSD formats.  But this is the right fix for future usage, of
  course. -- tiwai ]

Addresses-Coverity: ("Unintentional integer overflow")
Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 801ebf10

sound/xen/xen_snd_front_alsa.c

+2 −2
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ static u64 to_sndif_formats_mask(u64 alsa_formats) 
	mask = 0;

	for (i = 0; i < ARRAY_SIZE(ALSA_SNDIF_FORMATS); i++)

		if (pcm_format_to_bits(ALSA_SNDIF_FORMATS[i].alsa) & alsa_formats)

			mask |= 1 << ALSA_SNDIF_FORMATS[i].sndif;

			mask |= BIT_ULL(ALSA_SNDIF_FORMATS[i].sndif);



	return mask;

}
@@ -208,7 +208,7 @@ static u64 to_alsa_formats_mask(u64 sndif_formats) 


	mask = 0;

	for (i = 0; i < ARRAY_SIZE(ALSA_SNDIF_FORMATS); i++)

		if (1 << ALSA_SNDIF_FORMATS[i].sndif & sndif_formats)

		if (BIT_ULL(ALSA_SNDIF_FORMATS[i].sndif) & sndif_formats)

			mask |= pcm_format_to_bits(ALSA_SNDIF_FORMATS[i].alsa);



	return mask;