From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 722E1C32792 for ; Thu, 3 Oct 2019 17:18:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 486E020865 for ; Thu, 3 Oct 2019 17:18:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570123105; bh=Qrmdlh54a97G3v74uvBNhghLzDukho25jehHop0KfnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yjn6ZVCJBoSsHNHbuOJ3Z45cK8C+L0ogryahALxh6VhwXXyTIFL9qfx3N/NV7+QaD 7mXFEJUXqruq4cUTlZAzBOUtd8ihO1zXUAUJKYac0csnz9CFbP/9XPkP8CT4yVXRl5 UyNz2HdiG2S8eFNm+A3h6KFrrp2LFdR6uVfaaM4I= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390089AbfJCQVM (ORCPT ); Thu, 3 Oct 2019 12:21:12 -0400 Received: from mail.kernel.org ([198.145.29.99]:49402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388845AbfJCQVL (ORCPT ); Thu, 3 Oct 2019 12:21:11 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BB5932054F; Thu, 3 Oct 2019 16:21:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1570119671; bh=Qrmdlh54a97G3v74uvBNhghLzDukho25jehHop0KfnI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uztMQIAczotyWoBUw+AvWJUbXiBPj0cseGQaAGvdlkvytXoTNB/TEQzGmL7cnZxje gBPJOd01TCW5Mz/8lUgteCx1hwI0vyt8R2F+oDNLKEgKhvrur4VNW7eg9WCudmGo1s v/1FwBdaG97SbhQILqJ7GDR7jbjWaJTViQyRZKJg= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Takashi Sakamoto , Takashi Iwai Subject: [PATCH 4.19 149/211] ALSA: firewire-tascam: handle error code when getting current source of clock Date: Thu, 3 Oct 2019 17:53:35 +0200 Message-Id: <20191003154521.989888006@linuxfoundation.org> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191003154447.010950442@linuxfoundation.org> References: <20191003154447.010950442@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Takashi Sakamoto commit 2617120f4de6d0423384e0e86b14c78b9de84d5a upstream. The return value of snd_tscm_stream_get_clock() is ignored. This commit checks the value and handle error. Fixes: e453df44f0d6 ("ALSA: firewire-tascam: add PCM functionality") Cc: # v4.4+ Signed-off-by: Takashi Sakamoto Link: https://lore.kernel.org/r/20190910135152.29800-2-o-takashi@sakamocchi.jp Signed-off-by: Takashi Iwai Signed-off-by: Greg Kroah-Hartman --- sound/firewire/tascam/tascam-pcm.c | 3 +++ 1 file changed, 3 insertions(+) --- a/sound/firewire/tascam/tascam-pcm.c +++ b/sound/firewire/tascam/tascam-pcm.c @@ -57,6 +57,9 @@ static int pcm_open(struct snd_pcm_subst goto err_locked; err = snd_tscm_stream_get_clock(tscm, &clock); + if (err < 0) + goto err_locked; + if (clock != SND_TSCM_CLOCK_INTERNAL || amdtp_stream_pcm_running(&tscm->rx_stream) || amdtp_stream_pcm_running(&tscm->tx_stream)) {