Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2521686pxj; Mon, 10 May 2021 05:07:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxo37gXzQAz9XdtIyu4j5E4zM3SLgldP7hhAvDEwLk+FZ13CLblNcqR0Jlz3gBRYE5Hl755 X-Received: by 2002:a05:6402:682:: with SMTP id f2mr28894858edy.297.1620648337918; Mon, 10 May 2021 05:05:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620648337; cv=none; d=google.com; s=arc-20160816; b=uPJmw5mnCIic+4HzLO9z/64EhLFN8+bfTkb6DpKFzabNnbN+RzkGjsJ/t/0hILwlZw L32epZRqBzWNUPqBnHeMIwUSzfknz2dCaChBCUgEWJmIJh87NS0Gnq4wLZs1HyKrtQjw JhOcnOByXj+QuklmPnBQnFuAAdzBl0XMx7m0Nk2a6y14vLk2FdUxiqjj5nUfMlccmlYt iSpSpd8Gp2NUU1pRoaJ5iSNNzrgODkk0OIxaoXK4hD6EwizfQmOwQdzV+/hCz0T0Zs4a sCJeFsfK4gt3b7c9gZr0mIRzMGEAwfvaMHv8SzBHfOS4fUGJ+UN6snG0rdzShiKZI4o7 jkOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jBqxMd/LcJTtKC8/aRjCyge/btKiy18ZBIf7QL4QpxE=; b=H8QjIT4mKx28E0ZZNtttPcxnkzA/6BRywBPmLA7UP89WLR/v0u3vrpAdRhlHNH7xJ/ 4aJfJb3OMViV7PNyb+gmi5VF4ac6grznx0SQszRdsiVkkJNYAKFNnqs0zokKvBtPOTFc 6qRKCzPmXzkXkfCbVtpS6dbxvAo6w6jZP/jRfJi7i/+00eT9edIaBZfNJnMzAeCjGuiQ W0/fyL5bHZsHgDGNnAddC8qPXUvuB+Fr5ox+OX44tNv0xn6SQOwgWljp19k8ora92d18 eNHyFV2ONz0NLLI5wEnHfFfbzEcpLktzk+9VQllRNgCxs08XpCDXT256sfi4CSuDphlS pwqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nVLIGPFL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id u21si13296910edo.341.2021.05.10.05.05.12; Mon, 10 May 2021 05:05:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=nVLIGPFL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243855AbhEJL53 (ORCPT + 99 others); Mon, 10 May 2021 07:57:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:36380 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235754AbhEJLGC (ORCPT ); Mon, 10 May 2021 07:06:02 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 4E0FA613D6; Mon, 10 May 2021 10:56:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644164; bh=L4Z/lavsAkh015cOpILC8zaDta2Yugo6DqHJ9fBvJK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nVLIGPFLL8CDT8q7b4z6za3BfOcKocFHOTy90jAxKpmFJ90zM900dOQvNUgt1MufF ZeH5uRHmQs08xUQaH8EPybTm9fk5hHWB/L7bQbUU8fn3ZyKMAuFxoQp4ygB/1g04EJ 7FE692UQY3CkCNfwTLQ+Doq6vDBuZAtP6fymOI/A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, syzbot+7f09440acc069a0d38ac@syzkaller.appspotmail.com, Peilin Ye , Mauro Carvalho Chehab Subject: [PATCH 5.11 313/342] media: dvbdev: Fix memory leak in dvb_media_device_free() Date: Mon, 10 May 2021 12:21:43 +0200 Message-Id: <20210510102020.448906056@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102010.096403571@linuxfoundation.org> References: <20210510102010.096403571@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peilin Ye commit bf9a40ae8d722f281a2721779595d6df1c33a0bf upstream. dvb_media_device_free() is leaking memory. Free `dvbdev->adapter->conn` before setting it to NULL, as documented in include/media/media-device.h: "The media_entity instance itself must be freed explicitly by the driver if required." Link: https://syzkaller.appspot.com/bug?id=9bbe4b842c98f0ed05c5eed77a226e9de33bf298 Link: https://lore.kernel.org/linux-media/20201211083039.521617-1-yepeilin.cs@gmail.com Cc: stable@vger.kernel.org Fixes: 0230d60e4661 ("[media] dvbdev: Add RF connector if needed") Reported-by: syzbot+7f09440acc069a0d38ac@syzkaller.appspotmail.com Signed-off-by: Peilin Ye Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Greg Kroah-Hartman --- drivers/media/dvb-core/dvbdev.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -241,6 +241,7 @@ static void dvb_media_device_free(struct if (dvbdev->adapter->conn) { media_device_unregister_entity(dvbdev->adapter->conn); + kfree(dvbdev->adapter->conn); dvbdev->adapter->conn = NULL; kfree(dvbdev->adapter->conn_pads); dvbdev->adapter->conn_pads = NULL;