diff options
| author | Dan Carpenter <dan.carpenter@oracle.com> | 2014-01-23 11:21:28 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-01-23 10:50:36 +0100 |
| commit | 4c3773eda49c872a3034382f8ec3080002e715bf (patch) | |
| tree | 3cb218d45c783600fad3eda4570ec3c4ce571353 /sound | |
| parent | 2387083157b858f0300f40e629b0fea30f4132c9 (diff) | |
| download | kernel-common-4c3773eda49c872a3034382f8ec3080002e715bf.tar.gz kernel-common-4c3773eda49c872a3034382f8ec3080002e715bf.tar.bz2 kernel-common-4c3773eda49c872a3034382f8ec3080002e715bf.zip | |
ALSA: bits vs bytes bug in snd_card_create()
The test here is intended intended to prevent shift wrapping bugs when
we do "1U << idx2". We should consider the number of bits in a u32
instead of the number of bytes.
[fix another chunk similarly by tiwai]
Fixes: 7bb2491b35a2 ('ALSA: Add kconfig to specify the max card numbers')
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/core/init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/core/init.c b/sound/core/init.c index 1351f22f651c..e3c93cd77ee7 100644 --- a/sound/core/init.c +++ b/sound/core/init.c @@ -170,7 +170,7 @@ int snd_card_create(int idx, const char *xid, if (idx < 0) { for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++) { /* idx == -1 == 0xffff means: take any free slot */ - if (idx2 < sizeof(int) && !(idx & (1U << idx2))) + if (idx2 < 32 && !(idx & (1U << idx2))) continue; if (!test_bit(idx2, snd_cards_lock)) { if (module_slot_match(module, idx2)) { @@ -183,7 +183,7 @@ int snd_card_create(int idx, const char *xid, if (idx < 0) { for (idx2 = 0; idx2 < SNDRV_CARDS; idx2++) { /* idx == -1 == 0xffff means: take any free slot */ - if (idx2 < sizeof(int) && !(idx & (1U << idx2))) + if (idx2 < 32 && !(idx & (1U << idx2))) continue; if (!test_bit(idx2, snd_cards_lock)) { if (!slots[idx2] || !*slots[idx2]) { |