[PATCH] drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation

[PATCH] drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation

[Alex Deucher]

Return -ENOMEM if the allocation fails.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
 drivers/gpu/drm/drm_edid.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 1688ff5..830f750 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2925,6 +2925,8 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
 			/* Speaker Allocation Data Block */
 			if (dbl == 3) {
 				*sadb = kmalloc(dbl, GFP_KERNEL);
+				if (!*sadb)
+					return -ENOMEM;
 				memcpy(*sadb, &db[1], dbl);
 				count = dbl;
 				break;
-- 
1.8.3.1

Re: [PATCH] drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation

[Jani Nikula]

On Sat, 28 Sep 2013, Alex Deucher <alexdeucher@gmail.com> wrote:
> Return -ENOMEM if the allocation fails.
>
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

> ---
>  drivers/gpu/drm/drm_edid.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
> index 1688ff5..830f750 100644
> --- a/drivers/gpu/drm/drm_edid.c
> +++ b/drivers/gpu/drm/drm_edid.c
> @@ -2925,6 +2925,8 @@ int drm_edid_to_speaker_allocation(struct edid *edid, u8 **sadb)
>  			/* Speaker Allocation Data Block */
>  			if (dbl == 3) {
>  				*sadb = kmalloc(dbl, GFP_KERNEL);
> +				if (!*sadb)
> +					return -ENOMEM;
>  				memcpy(*sadb, &db[1], dbl);
>  				count = dbl;
>  				break;
> -- 
> 1.8.3.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel