media: v4l2-core: Avoid the dangling pointer in v4l2_fh_release

Yunlongs · gregkh · commit f9f334f62f39 · 2021-07-14T16:59:19.000+02:00
[ Upstream commit 7dd0c9e ] A use after free bug caused by the dangling pointer filp->privitate_data in v4l2_fh_release. See https://lore.kernel.org/patchwork/patch/1419058/. My patch sets the dangling pointer to NULL to provide robust. Signed-off-by: Lv Yunlong <lyl2019@mail.ustc.edu.cn> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
diff --git a/drivers/media/v4l2-core/v4l2-fh.c b/drivers/media/v4l2-core/v4l2-fh.c
@@ -96,6 +96,7 @@ int v4l2_fh_release(struct file *filp)
 		v4l2_fh_del(fh);
 		v4l2_fh_exit(fh);
 		kfree(fh);
+		filp->private_data = NULL;
 	}
 	return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ int v4l2_fh_release(struct file *filp)`
`96`	`96`	`v4l2_fh_del(fh);`
`97`	`97`	`v4l2_fh_exit(fh);`
`98`	`98`	`kfree(fh);`
	`99`	`+ filp->private_data = NULL;`
`99`	`100`	`}`
`100`	`101`	`return 0;`
`101`	`102`	`}`