Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2468429pxj; Mon, 10 May 2021 03:50:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzgRAjNAphU33ggPSy+AEx0NjeSbFfa1FmMwVEoaj0PViMGiM1CeJvBC33sl+aKsxdXxNyx X-Received: by 2002:a17:906:9141:: with SMTP id y1mr26130674ejw.111.1620643851627; Mon, 10 May 2021 03:50:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620643851; cv=none; d=google.com; s=arc-20160816; b=IVCp+7CoZnVeZttZpkusQ3CzTd1qpsN9/OfHmvSb4KTJwQZHp4nR/yfoWhH38owB0q WLehi6QkaVgWsrv2JE8uEM37+JRg6dpHM6HiWFvRPbRPXLdjs26SHK2CB7KWKtP/vsm6 guL/wGSpfX5+GRH05b8qP11522gQm9c+Z83ABC2MqyetG+gU8BxiD/zFEfJimCzm+cfB u/6D3p9ueIWNbI+/OmUd12QTJ2uQL0m6Z9FCNuQyhuzYlyOT4kaFd7JeeiPxWubrqLt8 NKpSi8iNHjIR4a/HrW+jodKcBTtXKMzRT4S+8DvKvGJatD/o0V6PuWPADToC8tVE11hM 2egQ== 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=AQk+BD1rqwUWkapaTdRYfM3w03kzVP2ktziLMrslCtPTCf1rT5NWMVUgCf3WMpxISn sFGNpXvkb2jgpEyOX5obSv8lTGHjke4G3syvKD0ZF6spnEckv+j/iARUAc1fztNotROY ZmkB5bsuI4x/ooi34pZCRtMzMg3dNzuza9D9gUBos2aV7jbfZq8czw1lu6JD+j0HlKQw Esz4/6LCDr0PxkbpCQIgeKvAHOEmUf3FADXUjjM9fSbYdZejUOLLOcHlrseowMgn9zyI AhDIlw4+fl2m77G9Lde+eh9WC0GvZUrUuYJzlavVCgas4/ew2NPq2hdB8k42oc22MlZT iLcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=wUZeZ6ka; 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 g8si15009161eds.14.2021.05.10.03.50.28; Mon, 10 May 2021 03:50:51 -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=wUZeZ6ka; 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 S233389AbhEJKt7 (ORCPT + 99 others); Mon, 10 May 2021 06:49:59 -0400 Received: from mail.kernel.org ([198.145.29.99]:50608 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232827AbhEJKko (ORCPT ); Mon, 10 May 2021 06:40:44 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 44F646196A; Mon, 10 May 2021 10:31:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620642672; bh=L4Z/lavsAkh015cOpILC8zaDta2Yugo6DqHJ9fBvJK8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wUZeZ6kaRVtG3bMcmbGgDTFQ1aT6o4ABXBeBRZ03RUrrZAd1Mz7LHH1J7xAcJNyLx IrGEjyckDUU3YsyYXGjBYCExbXVZe0/2+CrCMuIw0+its9mRIBiq++ONTmVVynTeTM NyMmrJbYbhvEKoF9JCjjKZCobXLZ3RCpoIHXhrVI= 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.4 166/184] media: dvbdev: Fix memory leak in dvb_media_device_free() Date: Mon, 10 May 2021 12:21:00 +0200 Message-Id: <20210510101955.546465452@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510101950.200777181@linuxfoundation.org> References: <20210510101950.200777181@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;