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 9B460C2D0C1 for ; Thu, 19 Dec 2019 19:09:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 637D624679 for ; Thu, 19 Dec 2019 19:09:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576782582; bh=t4gPPwpKYB+p3CGg1LOOHBYsxOHEph6hE6VO8OEGwRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H2cuVAfXzy07k1eLM1uZR44DPq4jDdEuFGf3UZcGa4tN3i9Tgdp228P8iMhqj26j2 8Pzh1GcpWZgYlmKyn8eVTR2mgu487ky9/cp5nMZI7bbjzoMpYDIhOCnfrnK8Q934zz oQArux6J8i1drkIlPWQ3kcIBxrSoCPgh/B122KRQ= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727576AbfLSSkT (ORCPT ); Thu, 19 Dec 2019 13:40:19 -0500 Received: from mail.kernel.org ([198.145.29.99]:58958 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728345AbfLSSkR (ORCPT ); Thu, 19 Dec 2019 13:40:17 -0500 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 44F91222C2; Thu, 19 Dec 2019 18:40:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576780816; bh=t4gPPwpKYB+p3CGg1LOOHBYsxOHEph6hE6VO8OEGwRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CYcNx15aziSDBby7kq6ZqFo5dfMle3ygSX3vDB/fPlzCaRjdtANOUEROXu8NNwxCk PkEOqDKGSmzg8ykxJbZMzyI0IFnCUpAN1LIefH38wF0dzPRFehgMwk2FpF6Wpe1YO5 oTOaBAlKhWMXOLytX47IJ23sR9Ghs/jbVsG6nG2M= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Matti Aaltonen , Johan Hovold , Hans Verkuil , Mauro Carvalho Chehab Subject: [PATCH 4.4 112/162] media: radio: wl1273: fix interrupt masking on release Date: Thu, 19 Dec 2019 19:33:40 +0100 Message-Id: <20191219183214.558751502@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191219183150.477687052@linuxfoundation.org> References: <20191219183150.477687052@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: Johan Hovold commit 1091eb830627625dcf79958d99353c2391f41708 upstream. If a process is interrupted while accessing the radio device and the core lock is contended, release() could return early and fail to update the interrupt mask. Note that the return value of the v4l2 release file operation is ignored. Fixes: 87d1a50ce451 ("[media] V4L2: WL1273 FM Radio: TI WL1273 FM radio driver") Cc: stable # 2.6.38 Cc: Matti Aaltonen Signed-off-by: Johan Hovold Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/radio/radio-wl1273.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/media/radio/radio-wl1273.c +++ b/drivers/media/radio/radio-wl1273.c @@ -1149,8 +1149,7 @@ static int wl1273_fm_fops_release(struct if (radio->rds_users > 0) { radio->rds_users--; if (radio->rds_users == 0) { - if (mutex_lock_interruptible(&core->lock)) - return -EINTR; + mutex_lock(&core->lock); radio->irq_flags &= ~WL1273_RDS_EVENT;