diff mbox series

[4.9,36/47] ALSA: mixart: Fix mutex deadlock

Message ID	20201123121807.301191486@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Dan Carpenter <dan.carpenter@oracle.com>, Takashi Iwai <tiwai@suse.de> Subject: [PATCH 4.9 36/47] ALSA: mixart: Fix mutex deadlock Date: Mon, 23 Nov 2020 13:22:22 +0100 Message-Id: <20201123121807.301191486@linuxfoundation.org> In-Reply-To: <20201123121805.530891002@linuxfoundation.org> References: <20201123121805.530891002@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,02/47] atm: nicstar: Unmap DMA on send error [4.9,03/47] bnxt_en: read EEPROM A2h address using page 0 [4.9,04/47] devlink: Add missing genlmsg_cancel() in devlink_nl_sb_port_pool_fill() [4.9,05/47] inet_diag: Fix error path to cancel the meseage in inet_req_diag_fill() [4.9,06/47] net: b44: fix error return code in b44_init_one() [4.9,07/47] net: bridge: add missing counters to ndo_get_stats64 callback [4.9,08/47] net: Have netpoll bring-up DSA management interface [4.9,09/47] netlabel: fix our progress tracking in netlbl_unlabel_staticlist() [4.9,10/47] netlabel: fix an uninitialized warning in netlbl_unlabel_staticlist() [4.9,11/47] net/mlx4_core: Fix init_hca fields offset [4.9,12/47] net: x25: Increase refcnt of "struct x25_neigh" in x25_rx_call_request [4.9,13/47] qlcnic: fix error return code in qlcnic_83xx_restart_hw() [4.9,14/47] sctp: change to hold/put transport for proto_unreach_timer [4.9,15/47] net: usb: qmi_wwan: Set DTR quirk for MR400 [4.9,16/47] tcp: only postpone PROBE_RTT if RTT is < current min_rtt estimate [4.9,17/47] net: ftgmac100: Fix crash when removing driver [4.9,18/47] mlxsw: core: Use variable timeout for EMAD retries [4.9,19/47] pinctrl: rockchip: enable gpio pclk for rockchip_gpio_to_irq [4.9,20/47] arm64: psci: Avoid printing in cpu_psci_cpu_die() [4.9,21/47] vfs: remove lockdep bogosity in __sb_start_write [4.9,22/47] Input: adxl34x - clean up a data type in adxl34x_probe() [4.9,23/47] MIPS: export has_transparent_hugepage() for modules [4.9,24/47] arm: dts: imx6qdl-udoo: fix rgmii phy-mode for ksz9031 phy [4.9,25/47] ARM: dts: imx50-evk: Fix the chip select 1 IOMUX [4.9,26/47] perf lock: Dont free "lock_seq_stat" if read_count isnt zero [4.9,27/47] can: dev: can_restart(): post buffer from the right context [4.9,28/47] can: peak_usb: fix potential integer overflow on shift of a int [4.9,29/47] can: m_can: m_can_handle_state_change(): fix state change [4.9,30/47] MIPS: Alchemy: Fix memleak in alchemy_clk_setup_cpu [4.9,31/47] regulator: ti-abb: Fix array out of bound read access on the first transition [4.9,32/47] xfs: revert "xfs: fix rmap key and record comparison functions" [4.9,33/47] libfs: fix error cast of negative value in simple_attr_write() [4.9,34/47] powerpc/uaccess-flush: fix missing includes in kup-radix.h [4.9,35/47] ALSA: ctl: fix error path at adding user-defined element set [4.9,36/47] ALSA: mixart: Fix mutex deadlock [4.9,37/47] tty: serial: imx: keep console clocks always on [4.9,38/47] efivarfs: fix memory leak in efivarfs_create() [4.9,39/47] ext4: fix bogus warning in ext4_update_dx_flag() [4.9,40/47] iio: accel: kxcjk1013: Replace is_smo8500_device with an acpi_type enum [4.9,41/47] regulator: fix memory leak with repeated set_machine_constraints() [4.9,42/47] xtensa: disable preemption around cache alias management calls [4.9,43/47] mac80211: minstrel: remove deferred sampling code [4.9,44/47] mac80211: minstrel: fix tx status processing corner case [4.9,45/47] mac80211: free sta in sta_info_insert_finish() on errors [4.9,46/47] s390/cpum_sf.c: fix file permission for cpum_sfb_size [4.9,47/47] x86/microcode/intel: Check patch signature before saving microcode for early loading

Commit Message

Greg KH Nov. 23, 2020, 12:22 p.m. UTC

From: Takashi Iwai <tiwai@suse.de>

commit d21b96c8ed2aea7e6b7bf4735e1d2503cfbf4072 upstream.

The code change for switching to non-atomic mode brought the
unexpected mutex deadlock in get_msg().  It converted the spinlock
with the existing mutex, but there were calls with the already holding
the mutex.  Since the only place that needs the extra lock is the code
path from snd_mixart_send_msg(), remove the mutex lock in get_msg()
and apply in the caller side for fixing the mutex deadlock.

Fixes: 8d3a8b5cb57d ("ALSA: mixart: Use nonatomic PCM ops")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20201119121440.18945-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 sound/pci/mixart/mixart_core.c |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff mbox series

Patch

--- a/sound/pci/mixart/mixart_core.c
+++ b/sound/pci/mixart/mixart_core.c
@@ -83,7 +83,6 @@  static int get_msg(struct mixart_mgr *mg
 	unsigned int i;
 #endif
 
-	mutex_lock(&mgr->msg_lock);
 	err = 0;
 
 	/* copy message descriptor from miXart to driver */
@@ -132,8 +131,6 @@  static int get_msg(struct mixart_mgr *mg
 	writel_be(headptr, MIXART_MEM(mgr, MSG_OUTBOUND_FREE_HEAD));
 
  _clean_exit:
-	mutex_unlock(&mgr->msg_lock);
-
 	return err;
 }
 
@@ -271,7 +268,9 @@  int snd_mixart_send_msg(struct mixart_mg
 	resp.data = resp_data;
 	resp.size = max_resp_size;
 
+	mutex_lock(&mgr->msg_lock);
 	err = get_msg(mgr, &resp, msg_frame);
+	mutex_unlock(&mgr->msg_lock);
 
 	if( request->message_id != resp.message_id )
 		dev_err(&mgr->pci->dev, "RESPONSE ERROR!\n");