From patchwork Tue Aug 7 02:47:03 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Devin Heitmueller X-Patchwork-Id: 13653 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SyZqU-00074w-Ip for patchwork@linuxtv.org; Tue, 07 Aug 2012 04:48:34 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-3) with esmtp for id 1SyZqT-0000Xz-G2; Tue, 07 Aug 2012 04:48:34 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932563Ab2HGCsB (ORCPT ); Mon, 6 Aug 2012 22:48:01 -0400 Received: from mail-vc0-f174.google.com ([209.85.220.174]:52727 "EHLO mail-vc0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932526Ab2HGCsA (ORCPT ); Mon, 6 Aug 2012 22:48:00 -0400 Received: by mail-vc0-f174.google.com with SMTP id fk26so3432709vcb.19 for ; Mon, 06 Aug 2012 19:47:59 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=MwYGdgorDlQpJbx2A97g0oDGjUdIu+D7GxRwKDS3URM=; b=YvA6js2uUmu1v6qCq4ZNPkZhiaKS3E6n7ikJtq8Axilr4ije2COWVsmpH7EMPxPcrK Og3g9kCS5irKJTdtt6L6EjKxmJ3IdNIdK8gpcT6NiW4a2Ma+uEqlbgcyOJRoX5DrdViK 4NwyH5QIB3mM5WbSX6J6r1/8qYkTnIs7UmxogvE2BBDOJsqWfsskrKenTM1fCCclkR0X BQZ28Zz2KgM45JoZh0VXZklUoRGANZhL2k+7TyPbB7GC8bwvBLSwuy9SNtPHYPJ3yzb6 merQv7+M+aNvNTARJWeFeWkIyXy8qzf8PHsX1RMt+kAshJN0O8shVSr4QVLS3E/3JAM5 bhdA== Received: by 10.52.180.66 with SMTP id dm2mr2904809vdc.1.1344307679702; Mon, 06 Aug 2012 19:47:59 -0700 (PDT) Received: from localhost.localdomain (pool-108-54-72-165.nycmny.fios.verizon.net. [108.54.72.165]) by mx.google.com with ESMTPS id e9sm17555638vdf.21.2012.08.06.19.47.58 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 06 Aug 2012 19:47:59 -0700 (PDT) From: Devin Heitmueller To: linux-media@vger.kernel.org Cc: Devin Heitmueller Subject: [PATCH 13/24] au0828: fix case where STREAMOFF being called on stopped stream causes BUG() Date: Mon, 6 Aug 2012 22:47:03 -0400 Message-Id: <1344307634-11673-14-git-send-email-dheitmueller@kernellabs.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1344307634-11673-1-git-send-email-dheitmueller@kernellabs.com> References: <1344307634-11673-1-git-send-email-dheitmueller@kernellabs.com> X-Gm-Message-State: ALoCoQmv29CdaJheHL7sHPMMDAXnSXra8x38qlFWCfz9CcmySjAQ4SDeRMB9Pz37RwOXwpPhRMPo Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.8.7.23319 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1600_1699 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' We weren't checking whether the resource was in use before calling res_free(), so applications which called STREAMOFF on a v4l2 device that wasn't already streaming would cause a BUG() to be hit (MythTV). Reported-by: Larry Finger Reported-by: Jay Harbeston Signed-off-by: Devin Heitmueller --- drivers/media/video/au0828/au0828-video.c | 12 ++++++++---- 1 files changed, 8 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/au0828/au0828-video.c b/drivers/media/video/au0828/au0828-video.c index df92322..4d5b670 100644 --- a/drivers/media/video/au0828/au0828-video.c +++ b/drivers/media/video/au0828/au0828-video.c @@ -1702,14 +1702,18 @@ static int vidioc_streamoff(struct file *file, void *priv, (AUVI_INPUT(i).audio_setup)(dev, 0); } - videobuf_streamoff(&fh->vb_vidq); - res_free(fh, AU0828_RESOURCE_VIDEO); + if (res_check(fh, AU0828_RESOURCE_VIDEO)) { + videobuf_streamoff(&fh->vb_vidq); + res_free(fh, AU0828_RESOURCE_VIDEO); + } } else if (fh->type == V4L2_BUF_TYPE_VBI_CAPTURE) { dev->vbi_timeout_running = 0; del_timer_sync(&dev->vbi_timeout); - videobuf_streamoff(&fh->vb_vbiq); - res_free(fh, AU0828_RESOURCE_VBI); + if (res_check(fh, AU0828_RESOURCE_VBI)) { + videobuf_streamoff(&fh->vb_vbiq); + res_free(fh, AU0828_RESOURCE_VBI); + } } return 0;