From mboxrd@z Thu Jan 1 00:00:00 1970 From: Vincent Penquerc'h Subject: [PATCH] Fix calculation of memory needed for page handles Date: Tue, 09 Oct 2012 18:46:53 +0100 Message-ID: <5074630D.2000900@collabora.co.uk> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060603030502000009040506" Return-path: Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [93.93.135.160]) by gabe.freedesktop.org (Postfix) with ESMTP id 0CFAF9EFA8 for ; Tue, 9 Oct 2012 10:46:59 -0700 (PDT) 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: dri-devel@lists.freedesktop.org Cc: gregkh@linuxfoundation.org, Rob Clark List-Id: dri-devel@lists.freedesktop.org This is a multi-part message in MIME format. --------------060603030502000009040506 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Hi, Wrong sizeof used, fixed in attached patch, and below. >>From 7f430a4104bee5f75929580a66128b7b0e2859d9 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Tue, 9 Oct 2012 17:18:33 +0100 Subject: [PATCH] drm/omap: fix allocation size for page addresses array Signed-off-by: Rob Clark --- drivers/staging/omapdrm/omap_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c index c828743..4c1472c 100644 --- a/drivers/staging/omapdrm/omap_gem.c +++ b/drivers/staging/omapdrm/omap_gem.c @@ -246,7 +246,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj) * DSS, GPU, etc. are not cache coherent: */ if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) { - addrs = kmalloc(npages * sizeof(addrs), GFP_KERNEL); + addrs = kmalloc(npages * sizeof(*addrs), GFP_KERNEL); if (!addrs) { ret = -ENOMEM; goto free_pages; @@ -257,7 +257,7 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj) 0, PAGE_SIZE, DMA_BIDIRECTIONAL); } } else { - addrs = kzalloc(npages * sizeof(addrs), GFP_KERNEL); + addrs = kzalloc(npages * sizeof(*addrs), GFP_KERNEL); if (!addrs) { ret = -ENOMEM; goto free_pages; -- 1.7.9.5 --------------060603030502000009040506 Content-Type: text/x-patch; name="0001-omap_gem-fix-incorrect-allocation-size-for-page-addr.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-omap_gem-fix-incorrect-allocation-size-for-page-addr.pa"; filename*1="tch" >>From 6a3956290c8473e26047cc9570629fc15ec32cb1 Mon Sep 17 00:00:00 2001 From: Vincent Penquerc'h Date: Tue, 9 Oct 2012 17:18:33 +0100 Subject: [PATCH] omap_gem: fix incorrect allocation size for page addresses array --- drivers/staging/omapdrm/omap_gem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/staging/omapdrm/omap_gem.c b/drivers/staging/omapdrm/omap_gem.c index dc308e3..ea072e9 100644 --- a/drivers/staging/omapdrm/omap_gem.c +++ b/drivers/staging/omapdrm/omap_gem.c @@ -256,13 +256,13 @@ static int omap_gem_attach_pages(struct drm_gem_object *obj) * DSS, GPU, etc. are not cache coherent: */ if (omap_obj->flags & (OMAP_BO_WC|OMAP_BO_UNCACHED)) { - addrs = kmalloc(npages * sizeof(addrs), GFP_KERNEL); + addrs = kmalloc(npages * sizeof(*addrs), GFP_KERNEL); for (i = 0; i < npages; i++) { addrs[i] = dma_map_page(dev->dev, pages[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); } } else { - addrs = kzalloc(npages * sizeof(addrs), GFP_KERNEL); + addrs = kzalloc(npages * sizeof(*addrs), GFP_KERNEL); } omap_obj->addrs = addrs; -- 1.7.9.5 --------------060603030502000009040506 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/dri-devel --------------060603030502000009040506--