Commit f4fa9689 authored by Takashi Iwai's avatar Takashi Iwai
Browse files

ALSA: core: Don't refer to snd_cards array directly 



The snd_cards[] array holds the card pointers that have been currently
registered, and it's exported for the external modules that may need
to refer a card object.  But accessing to this array can be racy
against the driver probe or removal, as the card registration or free
may happen concurrently.

This patch gets rid of the direct access to snd_cards[] array and
provides a helper function to give the card object from the index
number with a refcount management.  Then the caller can access to the
given card object safely, and releases it via snd_card_unref().

While we're at it, add a proper comment to snd_card_unref() and make
it an inlined function for type-safety, too.

Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c9899549

include/sound/core.h

+14 −2
Original line number Original line Diff line number Diff line
@@ -226,7 +226,6 @@ int copy_from_user_toio(volatile void __iomem *dst, const void __user *src, size 




/* init.c */

/* init.c */





extern struct snd_card *snd_cards[SNDRV_CARDS];

int snd_card_locked(int card);

int snd_card_locked(int card);

#if IS_ENABLED(CONFIG_SND_MIXER_OSS)

#if IS_ENABLED(CONFIG_SND_MIXER_OSS)

#define SND_MIXER_OSS_NOTIFY_REGISTER	0

#define SND_MIXER_OSS_NOTIFY_REGISTER	0
@@ -251,7 +250,20 @@ int snd_card_add_dev_attr(struct snd_card *card, 
int snd_component_add(struct snd_card *card, const char *component);

int snd_component_add(struct snd_card *card, const char *component);

int snd_card_file_add(struct snd_card *card, struct file *file);

int snd_card_file_add(struct snd_card *card, struct file *file);

int snd_card_file_remove(struct snd_card *card, struct file *file);

int snd_card_file_remove(struct snd_card *card, struct file *file);

#define snd_card_unref(card)	put_device(&(card)->card_dev)



struct snd_card *snd_card_ref(int card);



/**

 * snd_card_unref - Unreference the card object

 * @card: the card object to unreference

 *

 * Call this function for the card object that was obtained via snd_card_ref()

 * or snd_lookup_minor_data().

 */

static inline void snd_card_unref(struct snd_card *card)

{

	put_device(&card->card_dev);

}





#define snd_card_set_dev(card, devptr) ((card)->dev = (devptr))

#define snd_card_set_dev(card, devptr) ((card)->dev = (devptr))

sound/core/init.c

+21 −2
Original line number Original line Diff line number Diff line
@@ -49,8 +49,7 @@ static const struct file_operations snd_shutdown_f_ops; 




/* locked for registering/using */

/* locked for registering/using */

static DECLARE_BITMAP(snd_cards_lock, SNDRV_CARDS);

static DECLARE_BITMAP(snd_cards_lock, SNDRV_CARDS);

struct snd_card *snd_cards[SNDRV_CARDS];

static struct snd_card *snd_cards[SNDRV_CARDS];

EXPORT_SYMBOL(snd_cards);





static DEFINE_MUTEX(snd_card_mutex);

static DEFINE_MUTEX(snd_card_mutex);
@@ -268,6 +267,26 @@ int snd_card_new(struct device *parent, int idx, const char *xid, 
}

}

EXPORT_SYMBOL(snd_card_new);

EXPORT_SYMBOL(snd_card_new);





/**

 * snd_card_ref - Get the card object from the index

 * @idx: the card index

 *

 * Returns a card object corresponding to the given index or NULL if not found.

 * Release the object via snd_card_unref().

 */

struct snd_card *snd_card_ref(int idx)

{

	struct snd_card *card;



	mutex_lock(&snd_card_mutex);

	card = snd_cards[idx];

	if (card)

		get_device(&card->card_dev);

	mutex_unlock(&snd_card_mutex);

	return card;

}

EXPORT_SYMBOL_GPL(snd_card_ref);



/* return non-zero if a card is already locked */

/* return non-zero if a card is already locked */

int snd_card_locked(int card)

int snd_card_locked(int card)

{

{

sound/core/oss/mixer_oss.c

+12 −4
Original line number Original line Diff line number Diff line
@@ -1403,24 +1403,32 @@ static int snd_mixer_oss_notify_handler(struct snd_card *card, int cmd) 




static int __init alsa_mixer_oss_init(void)

static int __init alsa_mixer_oss_init(void)

{

{

	struct snd_card *card;

	int idx;

	int idx;

	

	

	snd_mixer_oss_notify_callback = snd_mixer_oss_notify_handler;

	snd_mixer_oss_notify_callback = snd_mixer_oss_notify_handler;

	for (idx = 0; idx < SNDRV_CARDS; idx++) {

	for (idx = 0; idx < SNDRV_CARDS; idx++) {

		if (snd_cards[idx])

		card = snd_card_ref(idx);

			snd_mixer_oss_notify_handler(snd_cards[idx], SND_MIXER_OSS_NOTIFY_REGISTER);

		if (card) {

			snd_mixer_oss_notify_handler(card, SND_MIXER_OSS_NOTIFY_REGISTER);

			snd_card_unref(card);

		}

	}

	}

	return 0;

	return 0;

}

}





static void __exit alsa_mixer_oss_exit(void)

static void __exit alsa_mixer_oss_exit(void)

{

{

	struct snd_card *card;

	int idx;

	int idx;





	snd_mixer_oss_notify_callback = NULL;

	snd_mixer_oss_notify_callback = NULL;

	for (idx = 0; idx < SNDRV_CARDS; idx++) {

	for (idx = 0; idx < SNDRV_CARDS; idx++) {

		if (snd_cards[idx])

		card = snd_card_ref(idx);

			snd_mixer_oss_notify_handler(snd_cards[idx], SND_MIXER_OSS_NOTIFY_FREE);

		if (card) {

			snd_mixer_oss_notify_handler(card, SND_MIXER_OSS_NOTIFY_FREE);

			snd_card_unref(card);

		}

	}

	}

}

}

sound/core/sound.c

+4 −1
Original line number Original line Diff line number Diff line
@@ -134,8 +134,11 @@ static struct snd_minor *autoload_device(unsigned int minor) 
	if (dev == SNDRV_MINOR_CONTROL) {

	if (dev == SNDRV_MINOR_CONTROL) {

		/* /dev/aloadC? */

		/* /dev/aloadC? */

		int card = SNDRV_MINOR_CARD(minor);

		int card = SNDRV_MINOR_CARD(minor);

		if (snd_cards[card] == NULL)

		struct snd_card *ref = snd_card_ref(card);

		if (!ref)

			snd_request_card(card);

			snd_request_card(card);

		else

			snd_card_unref(ref);

	} else if (dev == SNDRV_MINOR_GLOBAL) {

	} else if (dev == SNDRV_MINOR_GLOBAL) {

		/* /dev/aloadSEQ */

		/* /dev/aloadSEQ */

		snd_request_other(minor);

		snd_request_other(minor);

sound/last.c

+7 −3
Original line number Original line Diff line number Diff line
@@ -24,14 +24,18 @@ 




static int __init alsa_sound_last_init(void)

static int __init alsa_sound_last_init(void)

{

{

	struct snd_card *card;

	int idx, ok = 0;

	int idx, ok = 0;

	

	

	printk(KERN_INFO "ALSA device list:\n");

	printk(KERN_INFO "ALSA device list:\n");

	for (idx = 0; idx < SNDRV_CARDS; idx++)

	for (idx = 0; idx < SNDRV_CARDS; idx++) {

		if (snd_cards[idx] != NULL) {

		card = snd_card_ref(idx);

			printk(KERN_INFO "  #%i: %s\n", idx, snd_cards[idx]->longname);

		if (card) {

			printk(KERN_INFO "  #%i: %s\n", idx, card->longname);

			snd_card_unref(card);

			ok++;

			ok++;

		}

		}

	}

	if (ok == 0)

	if (ok == 0)

		printk(KERN_INFO "  No soundcards found.\n");

		printk(KERN_INFO "  No soundcards found.\n");

	return 0;

	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE