Skip to content

Commit f9e46ac

Browse files
Dan CarpenterFomys
authored andcommitted
drm/vkms: Fix use after frees on error paths
These error paths free a pointer and then dereference it on the next line to get the error code. Save the error code first and then free the memory. Fixes: 3e4d5b3 ("drm/vkms: Allow to configure multiple CRTCs via configfs") Fixes: 2f1734b ("drm/vkms: Allow to configure multiple planes via configfs") Fixes: 67d8cf9 ("drm/vkms: Allow to configure multiple encoders via configfs") Fixes: 272acbc ("drm/vkms: Allow to configure multiple connectors via configfs") Fixes: 13fc9b9 ("drm/vkms: Add and remove VKMS instances via configfs") Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org> Reviewed-by: José Expósito <jose.exposito89@gmail.com> Link: https://lore.kernel.org/r/aPtfy2jCI_kb3Df7@stanley.mountain Signed-off-by: Louis Chauvet <louis.chauvet@bootlin.com>
1 parent 71829d7 commit f9e46ac

1 file changed

Lines changed: 15 additions & 5 deletions

File tree

drivers/gpu/drm/vkms/vkms_configfs.c

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,7 @@ static struct config_group *make_crtc_group(struct config_group *group,
204204
{
205205
struct vkms_configfs_device *dev;
206206
struct vkms_configfs_crtc *crtc;
207+
int ret;
207208

208209
dev = child_group_to_vkms_configfs_device(group);
209210

@@ -219,8 +220,9 @@ static struct config_group *make_crtc_group(struct config_group *group,
219220

220221
crtc->config = vkms_config_create_crtc(dev->config);
221222
if (IS_ERR(crtc->config)) {
223+
ret = PTR_ERR(crtc->config);
222224
kfree(crtc);
223-
return ERR_CAST(crtc->config);
225+
return ERR_PTR(ret);
224226
}
225227

226228
config_group_init_type_name(&crtc->group, name, &crtc_item_type);
@@ -358,6 +360,7 @@ static struct config_group *make_plane_group(struct config_group *group,
358360
{
359361
struct vkms_configfs_device *dev;
360362
struct vkms_configfs_plane *plane;
363+
int ret;
361364

362365
dev = child_group_to_vkms_configfs_device(group);
363366

@@ -373,8 +376,9 @@ static struct config_group *make_plane_group(struct config_group *group,
373376

374377
plane->config = vkms_config_create_plane(dev->config);
375378
if (IS_ERR(plane->config)) {
379+
ret = PTR_ERR(plane->config);
376380
kfree(plane);
377-
return ERR_CAST(plane->config);
381+
return ERR_PTR(ret);
378382
}
379383

380384
config_group_init_type_name(&plane->group, name, &plane_item_type);
@@ -472,6 +476,7 @@ static struct config_group *make_encoder_group(struct config_group *group,
472476
{
473477
struct vkms_configfs_device *dev;
474478
struct vkms_configfs_encoder *encoder;
479+
int ret;
475480

476481
dev = child_group_to_vkms_configfs_device(group);
477482

@@ -487,8 +492,9 @@ static struct config_group *make_encoder_group(struct config_group *group,
487492

488493
encoder->config = vkms_config_create_encoder(dev->config);
489494
if (IS_ERR(encoder->config)) {
495+
ret = PTR_ERR(encoder->config);
490496
kfree(encoder);
491-
return ERR_CAST(encoder->config);
497+
return ERR_PTR(ret);
492498
}
493499

494500
config_group_init_type_name(&encoder->group, name,
@@ -637,6 +643,7 @@ static struct config_group *make_connector_group(struct config_group *group,
637643
{
638644
struct vkms_configfs_device *dev;
639645
struct vkms_configfs_connector *connector;
646+
int ret;
640647

641648
dev = child_group_to_vkms_configfs_device(group);
642649

@@ -652,8 +659,9 @@ static struct config_group *make_connector_group(struct config_group *group,
652659

653660
connector->config = vkms_config_create_connector(dev->config);
654661
if (IS_ERR(connector->config)) {
662+
ret = PTR_ERR(connector->config);
655663
kfree(connector);
656-
return ERR_CAST(connector->config);
664+
return ERR_PTR(ret);
657665
}
658666

659667
config_group_init_type_name(&connector->group, name,
@@ -756,6 +764,7 @@ static struct config_group *make_device_group(struct config_group *group,
756764
const char *name)
757765
{
758766
struct vkms_configfs_device *dev;
767+
int ret;
759768

760769
if (strcmp(name, DEFAULT_DEVICE_NAME) == 0)
761770
return ERR_PTR(-EINVAL);
@@ -766,8 +775,9 @@ static struct config_group *make_device_group(struct config_group *group,
766775

767776
dev->config = vkms_config_create(name);
768777
if (IS_ERR(dev->config)) {
778+
ret = PTR_ERR(dev->config);
769779
kfree(dev);
770-
return ERR_CAST(dev->config);
780+
return ERR_PTR(ret);
771781
}
772782

773783
config_group_init_type_name(&dev->group, name, &device_item_type);

0 commit comments

Comments
 (0)