Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1250912 > unrolled thread

[PATCH] drm: correctly check failed allocation

Started byInsu Yun <wuninsu@gmail.com>
First post2015-10-19 18:40 +0200
Last post2015-10-21 09:40 +0200
Articles 2 — 2 participants

Back to article view | Back to linux.kernel

Contents

  [PATCH] drm: correctly check failed allocation Insu Yun <wuninsu@gmail.com> - 2015-10-19 18:40 +0200
    Re: [PATCH] drm: correctly check failed allocation Daniel Vetter <daniel@ffwll.ch> - 2015-10-21 09:40 +0200

#1250912 — [PATCH] drm: correctly check failed allocation

FromInsu Yun <wuninsu@gmail.com>
Date2015-10-19 18:40 +0200
Subject[PATCH] drm: correctly check failed allocation
Message-ID<qllDB-1vN-35@gated-at.bofh.it>
drm_property_create_range can be failed in memory pressure
Therefore, check return value and handle an error

Signed-off-by: Insu Yun <wuninsu@gmail.com>
---
 drivers/gpu/drm/drm_crtc.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 33d877c..5fb6583 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1525,6 +1525,9 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
 					  "select subconnector",
 					  drm_tv_select_enum_list,
 					  ARRAY_SIZE(drm_tv_select_enum_list));
+	if (!tv_selector)
+		goto nomem;
+
 	dev->mode_config.tv_select_subconnector_property = tv_selector;
 
 	tv_subconnector =
@@ -1532,6 +1535,8 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
 				    "subconnector",
 				    drm_tv_subconnector_enum_list,
 				    ARRAY_SIZE(drm_tv_subconnector_enum_list));
+	if (!tv_subconnector)
+		goto nomem;
 	dev->mode_config.tv_subconnector_property = tv_subconnector;
 
 	/*
@@ -1539,42 +1544,67 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
 	 */
 	dev->mode_config.tv_left_margin_property =
 		drm_property_create_range(dev, 0, "left margin", 0, 100);
+	if (!dev->mode_config.tv_left_margin_property)
+		goto nomem;
 
 	dev->mode_config.tv_right_margin_property =
 		drm_property_create_range(dev, 0, "right margin", 0, 100);
+	if (!dev->mode_config.tv_right_margin_property)
+		goto nomem;
 
 	dev->mode_config.tv_top_margin_property =
 		drm_property_create_range(dev, 0, "top margin", 0, 100);
+	if (!dev->mode_config.tv_top_margin_property)
+		goto nomem;
 
 	dev->mode_config.tv_bottom_margin_property =
 		drm_property_create_range(dev, 0, "bottom margin", 0, 100);
+	if (!dev->mode_config.tv_bottom_margin_property)
+		goto nomem;
 
 	dev->mode_config.tv_mode_property =
 		drm_property_create(dev, DRM_MODE_PROP_ENUM,
 				    "mode", num_modes);
+	if (!dev->mode_config.tv_mode_property)
+		goto nomem;
+
 	for (i = 0; i < num_modes; i++)
 		drm_property_add_enum(dev->mode_config.tv_mode_property, i,
 				      i, modes[i]);
 
 	dev->mode_config.tv_brightness_property =
 		drm_property_create_range(dev, 0, "brightness", 0, 100);
+	if (!dev->mode_config.tv_brightness_property)
+		goto nomem;
 
 	dev->mode_config.tv_contrast_property =
 		drm_property_create_range(dev, 0, "contrast", 0, 100);
+	if (!dev->mode_config.tv_contrast_property)
+		goto nomem;
 
 	dev->mode_config.tv_flicker_reduction_property =
 		drm_property_create_range(dev, 0, "flicker reduction", 0, 100);
+	if (!dev->mode_config.tv_flicker_reduction_property)
+		goto nomem;
 
 	dev->mode_config.tv_overscan_property =
 		drm_property_create_range(dev, 0, "overscan", 0, 100);
+	if (!dev->mode_config.tv_overscan_property)
+		goto nomem;
 
 	dev->mode_config.tv_saturation_property =
 		drm_property_create_range(dev, 0, "saturation", 0, 100);
+	if (!dev->mode_config.tv_saturation_property)
+		goto nomem;
 
 	dev->mode_config.tv_hue_property =
 		drm_property_create_range(dev, 0, "hue", 0, 100);
+	if (!dev->mode_config.tv_hue_property)
+		goto nomem;
 
 	return 0;
+nomem:
+	return -ENOMEM;
 }
 EXPORT_SYMBOL(drm_mode_create_tv_properties);
 
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1252517

FromDaniel Vetter <daniel@ffwll.ch>
Date2015-10-21 09:40 +0200
Message-ID<qlWa6-4E2-31@gated-at.bofh.it>
In reply to#1250912
On Mon, Oct 19, 2015 at 04:33:30PM +0000, Insu Yun wrote:
> drm_property_create_range can be failed in memory pressure
> Therefore, check return value and handle an error
> 
> Signed-off-by: Insu Yun <wuninsu@gmail.com>

There's also other drm_property_create_* functions, and we miss error
handling for a bunch more of these places. Are you working on more
patches?

Merged this one to drm-misc meanwhile, thanks.
-Daniel

> ---
>  drivers/gpu/drm/drm_crtc.c | 30 ++++++++++++++++++++++++++++++
>  1 file changed, 30 insertions(+)
> 
> diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
> index 33d877c..5fb6583 100644
> --- a/drivers/gpu/drm/drm_crtc.c
> +++ b/drivers/gpu/drm/drm_crtc.c
> @@ -1525,6 +1525,9 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
>  					  "select subconnector",
>  					  drm_tv_select_enum_list,
>  					  ARRAY_SIZE(drm_tv_select_enum_list));
> +	if (!tv_selector)
> +		goto nomem;
> +
>  	dev->mode_config.tv_select_subconnector_property = tv_selector;
>  
>  	tv_subconnector =
> @@ -1532,6 +1535,8 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
>  				    "subconnector",
>  				    drm_tv_subconnector_enum_list,
>  				    ARRAY_SIZE(drm_tv_subconnector_enum_list));
> +	if (!tv_subconnector)
> +		goto nomem;
>  	dev->mode_config.tv_subconnector_property = tv_subconnector;
>  
>  	/*
> @@ -1539,42 +1544,67 @@ int drm_mode_create_tv_properties(struct drm_device *dev,
>  	 */
>  	dev->mode_config.tv_left_margin_property =
>  		drm_property_create_range(dev, 0, "left margin", 0, 100);
> +	if (!dev->mode_config.tv_left_margin_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_right_margin_property =
>  		drm_property_create_range(dev, 0, "right margin", 0, 100);
> +	if (!dev->mode_config.tv_right_margin_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_top_margin_property =
>  		drm_property_create_range(dev, 0, "top margin", 0, 100);
> +	if (!dev->mode_config.tv_top_margin_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_bottom_margin_property =
>  		drm_property_create_range(dev, 0, "bottom margin", 0, 100);
> +	if (!dev->mode_config.tv_bottom_margin_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_mode_property =
>  		drm_property_create(dev, DRM_MODE_PROP_ENUM,
>  				    "mode", num_modes);
> +	if (!dev->mode_config.tv_mode_property)
> +		goto nomem;
> +
>  	for (i = 0; i < num_modes; i++)
>  		drm_property_add_enum(dev->mode_config.tv_mode_property, i,
>  				      i, modes[i]);
>  
>  	dev->mode_config.tv_brightness_property =
>  		drm_property_create_range(dev, 0, "brightness", 0, 100);
> +	if (!dev->mode_config.tv_brightness_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_contrast_property =
>  		drm_property_create_range(dev, 0, "contrast", 0, 100);
> +	if (!dev->mode_config.tv_contrast_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_flicker_reduction_property =
>  		drm_property_create_range(dev, 0, "flicker reduction", 0, 100);
> +	if (!dev->mode_config.tv_flicker_reduction_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_overscan_property =
>  		drm_property_create_range(dev, 0, "overscan", 0, 100);
> +	if (!dev->mode_config.tv_overscan_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_saturation_property =
>  		drm_property_create_range(dev, 0, "saturation", 0, 100);
> +	if (!dev->mode_config.tv_saturation_property)
> +		goto nomem;
>  
>  	dev->mode_config.tv_hue_property =
>  		drm_property_create_range(dev, 0, "hue", 0, 100);
> +	if (!dev->mode_config.tv_hue_property)
> +		goto nomem;
>  
>  	return 0;
> +nomem:
> +	return -ENOMEM;
>  }
>  EXPORT_SYMBOL(drm_mode_create_tv_properties);
>  
> -- 
> 1.9.1
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web