From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/edid: catch kmalloc failure in drm_edid_to_speaker_allocation Date: Mon, 30 Sep 2013 08:36:42 +0300 Message-ID: <87ioxi3m6t.fsf@intel.com> References: <1380321969-16078-1-git-send-email-alexander.deucher@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id 649F8E5BFE for ; Sun, 29 Sep 2013 22:39:32 -0700 (PDT) In-Reply-To: <1380321969-16078-1-git-send-email-alexander.deucher@amd.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Alex Deucher , dri-devel@lists.freedesktop.org Cc: Alex Deucher List-Id: dri-devel@lists.freedesktop.org On Sat, 28 Sep 2013, Alex Deucher wrote: > Return -ENOMEM if the allocation fails. > > Signed-off-by: Alex Deucher Reviewed-by: Jani Nikula > --- > 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