From patchwork Thu Oct 8 07:08:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 268533 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=-10.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=ham 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 04E22C433E7 for ; Thu, 8 Oct 2020 07:10:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A11EA2064C for ; Thu, 8 Oct 2020 07:10:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1602141016; bh=EQUuykYLoWvBGpW08n0SldLu7R06WMUGQf5HAUbzRQ8=; h=From:Date:Subject:To:Cc:Reply-to:List-ID:From; b=BZg+hc5lCnHFRCkY3PoaQK1tLnA5vdZghwbQxlBrJ9ICwM56dMktZsCAWSAbWRm2L H3KJHtS+EdoZllp/G18eN5o/kO0Ua87vW1rKKR24hknjnjhlnw3zeTudU9OctAV/Nf KuovS9WIor/0GTV1GXcb7aK8bD9sE6qGjKGg0y/8= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725857AbgJHHKQ (ORCPT ); Thu, 8 Oct 2020 03:10:16 -0400 Received: from www.linuxtv.org ([130.149.80.248]:50212 "EHLO www.linuxtv.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725852AbgJHHKP (ORCPT ); Thu, 8 Oct 2020 03:10:15 -0400 Received: from mchehab by www.linuxtv.org with local (Exim 4.92) (envelope-from ) id 1kQPxa-008XNm-RZ; Thu, 08 Oct 2020 07:03:30 +0000 From: Mauro Carvalho Chehab Date: Thu, 08 Oct 2020 07:08:20 +0000 Subject: [git:media_tree/master] media: usbtv: Fix refcounting mixup To: linuxtv-commits@linuxtv.org Cc: Oliver Neukum , Hans Verkuil , stable@vger.kernel.org Mail-followup-to: linux-media@vger.kernel.org Forward-to: linux-media@vger.kernel.org Reply-to: linux-media@vger.kernel.org Message-Id: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org This is an automatic generated email to let you know that the following patch were queued: Subject: media: usbtv: Fix refcounting mixup Author: Oliver Neukum Date: Thu Sep 24 11:14:10 2020 +0200 The premature free in the error path is blocked by V4L refcounting, not USB refcounting. Thanks to Ben Hutchings for review. [v2] corrected attributions Signed-off-by: Oliver Neukum Fixes: 50e704453553 ("media: usbtv: prevent double free in error case") CC: stable@vger.kernel.org Reported-by: Ben Hutchings Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab drivers/media/usb/usbtv/usbtv-core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/usb/usbtv/usbtv-core.c b/drivers/media/usb/usbtv/usbtv-core.c index ee9c656d121f..2308c0b4f5e7 100644 --- a/drivers/media/usb/usbtv/usbtv-core.c +++ b/drivers/media/usb/usbtv/usbtv-core.c @@ -113,7 +113,8 @@ static int usbtv_probe(struct usb_interface *intf, usbtv_audio_fail: /* we must not free at this point */ - usb_get_dev(usbtv->udev); + v4l2_device_get(&usbtv->v4l2_dev); + /* this will undo the v4l2_device_get() */ usbtv_video_free(usbtv); usbtv_video_fail: