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;
From:   Michael Kelley <mikelley@microsoft.com>
To:     Lv Yunlong <lyl2019@mail.ustc.edu.cn>,
        KY Srinivasan <kys@microsoft.com>,
        Haiyang Zhang <haiyangz@microsoft.com>,
        Stephen Hemminger <sthemmin@microsoft.com>,
        "wei.liu@kernel.org" <wei.liu@kernel.org>
CC:     "linux-hyperv@vger.kernel.org" <linux-hyperv@vger.kernel.org>,
        "dri-devel@lists.freedesktop.org" <dri-devel@lists.freedesktop.org>,
        "linux-fbdev@vger.kernel.org" <linux-fbdev@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: RE: [PATCH] video/fbdev: Fix a double free in hvfb_probe
Thread-Topic: [PATCH] video/fbdev: Fix a double free in hvfb_probe
Thread-Index: AQHXH7cUAxkwwvLRO0Kx2qFQ1UKPxKqR6olg
Date:   Tue, 23 Mar 2021 18:52:07 +0000
Message-ID: <MWHPR21MB1593E96D24957865DB46D3DBD7649@MWHPR21MB1593.namprd21.prod.outlook.com>
References: <20210323073350.17697-1-lyl2019@mail.ustc.edu.cn>
In-Reply-To: <20210323073350.17697-1-lyl2019@mail.ustc.edu.cn>
Accept-Language: en-US
Content-Language: en-US
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: 021a5235-7eda-4fbb-f06a-08d8ee2cc220
X-MS-Exchange-CrossTenant-originalarrivaltime: 23 Mar 2021 18:52:07.4416
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-CrossTenant-mailboxtype: HOSTED
X-MS-Exchange-CrossTenant-userprincipalname: cedxDP7rYtkerOBEYI88g4imqz2dmO5ZQyMURQ6ipP96fgKMuwJEA0ZpaKdNie38UguCY0WULVcTSR/sLoya7bcTEs+M+SSWrVO+6/EEbB4=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR21MB0702
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Lv Yunlong <lyl2019@mail.ustc.edu.cn> Sent: Tuesday, March 23, 2021 1=
2:34 AM
>=20
> In function hvfb_probe in hyperv_fb.c, it calls hvfb_getmem(hdev, info)
> and return err when info->apertures is freed.
>=20
> In the error1 label of hvfb_probe, info->apertures will be freed twice
> by framebuffer_release(info).
>=20
> My patch sets info->apertures to NULL after it was freed to avoid
> double free.
>=20
> Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn>
> ---
>  drivers/video/fbdev/hyperv_fb.c | 3 +++
>  1 file changed, 3 insertions(+)
>=20
> diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv=
_fb.c
> index c8b0ae676809..2fc9b507e73a 100644
> --- a/drivers/video/fbdev/hyperv_fb.c
> +++ b/drivers/video/fbdev/hyperv_fb.c
> @@ -1032,6 +1032,7 @@ static int hvfb_getmem(struct hv_device *hdev, stru=
ct fb_info
> *info)
>  		if (!pdev) {
>  			pr_err("Unable to find PCI Hyper-V video\n");
>  			kfree(info->apertures);
> +			info->apertures =3D NULL;
>  			return -ENODEV;
>  		}
>=20
> @@ -1130,6 +1131,7 @@ static int hvfb_getmem(struct hv_device *hdev, stru=
ct fb_info
> *info)
>  		pci_dev_put(pdev);
>  	}
>  	kfree(info->apertures);
> +	info->apertures =3D NULL;
>=20
>  	return 0;
>=20
> @@ -1142,6 +1144,7 @@ static int hvfb_getmem(struct hv_device *hdev, stru=
ct fb_info
> *info)
>  	if (!gen2vm)
>  		pci_dev_put(pdev);
>  	kfree(info->apertures);
> +	info->apertures =3D NULL;
>=20
>  	return -ENOMEM;
>  }
> --
> 2.25.1
>=20

While I think this works, a slightly better solution might be to remove
all calls to kfree(info->apertures) in hvfb_getmem(),  and just let
framebuffer_release() handle freeing the memory.  That's what is
done in other drivers that follow the fbdev pattern, and it's less
code overall. =20

Michael