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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B9D8EC19F2A for ; Thu, 11 Aug 2022 16:18:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236133AbiHKQSX (ORCPT ); Thu, 11 Aug 2022 12:18:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:58758 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237115AbiHKQRy (ORCPT ); Thu, 11 Aug 2022 12:17:54 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 40C8AC3F5F; Thu, 11 Aug 2022 09:00:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id F10F560F39; Thu, 11 Aug 2022 16:00:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1BC24C433C1; Thu, 11 Aug 2022 16:00:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1660233607; bh=IK5sDWkGcp7UNJSpKBfdEty4JJCJ3n0BenPU3Os+Yz4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X1tx2GoAS8XQVfHC6MCe0rlQrFlhORzY1LScUue7+XZkVUhwd6AZW11IODTytflxM TbChs8eIVPsC0/+mfIFU3aJyWPStPFj4AZ+z1T8+ENBHX+1rzGmkH8JYYn6T3Sv5cz s3QSxhJaYSGxsi+gb0zatoqL/97BUP+dm/So3iKg8r6dG5LaoHYTmXpkE913Xd0dSG sUN+Rf/sRqufCruIR6m/y31sR8NKJurjtCSIidfQ0EZ7cG9gRbqKT8yoUkLuSgjeOo paiKKxTNsQLz8W/WE45P3nwKyise/VynC0pIWEh8v67XnWAlk9fCTnxS6yQwFyI5MC PQlzN6jiut3FA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dongliang Mu , syzbot+77b432d57c4791183ed4@syzkaller.appspotmail.com, Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , isely@pobox.com, linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 28/69] media: pvrusb2: fix memory leak in pvr_probe Date: Thu, 11 Aug 2022 11:55:37 -0400 Message-Id: <20220811155632.1536867-28-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220811155632.1536867-1-sashal@kernel.org> References: <20220811155632.1536867-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dongliang Mu [ Upstream commit 945a9a8e448b65bec055d37eba58f711b39f66f0 ] The error handling code in pvr2_hdw_create forgets to unregister the v4l2 device. When pvr2_hdw_create returns back to pvr2_context_create, it calls pvr2_context_destroy to destroy context, but mp->hdw is NULL, which leads to that pvr2_hdw_destroy directly returns. Fix this by adding v4l2_device_unregister to decrease the refcount of usb interface. Reported-by: syzbot+77b432d57c4791183ed4@syzkaller.appspotmail.com Signed-off-by: Dongliang Mu Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c index fccd1798445d..d22ce328a279 100644 --- a/drivers/media/usb/pvrusb2/pvrusb2-hdw.c +++ b/drivers/media/usb/pvrusb2/pvrusb2-hdw.c @@ -2610,6 +2610,7 @@ struct pvr2_hdw *pvr2_hdw_create(struct usb_interface *intf, del_timer_sync(&hdw->encoder_run_timer); del_timer_sync(&hdw->encoder_wait_timer); flush_work(&hdw->workpoll); + v4l2_device_unregister(&hdw->v4l2_dev); usb_free_urb(hdw->ctl_read_urb); usb_free_urb(hdw->ctl_write_urb); kfree(hdw->ctl_read_buffer); -- 2.35.1