diff options
| author | Takashi Sakamoto <o-takashi@sakamocchi.jp> | 2021-03-12 18:34:07 +0900 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2021-03-12 14:12:53 +0100 |
| commit | dd7b836d6bc935df95c826f69ff4d051f5561604 (patch) | |
| tree | cba8741ea510f6bd20110069f2830f3622292d93 /sound/firewire/dice/dice-stream.c | |
| parent | 2bf44e0ee95f39cc54ea1b942f0a027e0181ca4e (diff) | |
| download | lwn-dd7b836d6bc935df95c826f69ff4d051f5561604.tar.gz lwn-dd7b836d6bc935df95c826f69ff4d051f5561604.zip | |
ALSA: dice: fix null pointer dereference when node is disconnected
When node is removed from IEEE 1394 bus, any transaction fails to the node.
In the case, ALSA dice driver doesn't stop isochronous contexts even if
they are running. As a result, null pointer dereference occurs in callback
from the running context.
This commit fixes the bug to release isochronous contexts always.
Cc: <stable@vger.kernel.org> # v5.4 or later
Fixes: e9f21129b8d8 ("ALSA: dice: support AMDTP domain")
Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
Link: https://lore.kernel.org/r/20210312093407.23437-1-o-takashi@sakamocchi.jp
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/firewire/dice/dice-stream.c')
| -rw-r--r-- | sound/firewire/dice/dice-stream.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/firewire/dice/dice-stream.c b/sound/firewire/dice/dice-stream.c index 8e0c0380b4c4..1a14c083e8ce 100644 --- a/sound/firewire/dice/dice-stream.c +++ b/sound/firewire/dice/dice-stream.c @@ -493,11 +493,10 @@ void snd_dice_stream_stop_duplex(struct snd_dice *dice) struct reg_params tx_params, rx_params; if (dice->substreams_counter == 0) { - if (get_register_params(dice, &tx_params, &rx_params) >= 0) { - amdtp_domain_stop(&dice->domain); + if (get_register_params(dice, &tx_params, &rx_params) >= 0) finish_session(dice, &tx_params, &rx_params); - } + amdtp_domain_stop(&dice->domain); release_resources(dice); } } |