From mboxrd@z Thu Jan 1 00:00:00 1970 From: Prarit Bhargava Subject: Re: [PATCH]: nouveau and radeon checkstack fixes Date: Sat, 22 May 2010 19:07:55 -0400 Message-ID: <4BF863CB.2000504@redhat.com> References: <20100522002613.25238.63998.sendpatchset@prarit.bos.redhat.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------070405080708060005020408" Return-path: Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by gabe.freedesktop.org (Postfix) with ESMTP id 8909C9E7D1 for ; Sat, 22 May 2010 16:12:49 -0700 (PDT) In-Reply-To: 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: Maarten Maathuis Cc: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org This is a multi-part message in MIME format. --------------070405080708060005020408 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 05/22/2010 03:57 PM, Maarten Maathuis wrote: > On Sat, May 22, 2010 at 2:30 AM, Prarit Bhargava wrote: > >> Fixes linux-next& linux-2.6 checkstack warnings: >> >> drivers/gpu/drm/nouveau/nv40_graph.c: In function `nv40_graph_init': >> drivers/gpu/drm/nouveau/nv40_graph.c:400: warning: the frame size of 1184 bytes is larger than 1024 bytes >> drivers/gpu/drm/radeon/radeon_atombios.c: In function `radeon_get_atom_connector_info_from_supported_devices_table': >> drivers/gpu/drm/radeon/radeon_atombios.c:857: warning: the frame size of 1872 bytes is larger than 1024 bytes >> >> Signed-off-by: Prarit Bhargava >> >> diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c >> index 0616c96..3604394 100644 >> --- a/drivers/gpu/drm/nouveau/nv40_graph.c >> +++ b/drivers/gpu/drm/nouveau/nv40_graph.c >> @@ -253,7 +253,11 @@ nv40_graph_init(struct drm_device *dev) >> >> if (!dev_priv->engine.graph.ctxprog) { >> struct nouveau_grctx ctx = {}; >> - uint32_t cp[256]; >> + uint32_t *cp; >> + >> + cp = kmalloc(sizeof(*cp), GFP_KERNEL); >> + if (!cp) >> + return -ENOMEM; >> >> > This seems wrong, allocating 1 uint32_t isn't enough. > Oops! That obviously should have been (sizeof(*cp) * 256) ... New patch. Thanks Maarten, P. > >> ctx.dev = dev; >> ctx.mode = NOUVEAU_GRCTX_PROG; >> @@ -265,6 +269,8 @@ nv40_graph_init(struct drm_device *dev) >> nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0); >> for (i = 0; i< ctx.ctxprog_len; i++) >> nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]); >> + >> + kfree(cp); >> } >> >> /* No context present currently */ >> diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c >> index 1d05deb..5ad208c 100644 >> --- a/drivers/gpu/drm/radeon/radeon_atombios.c >> +++ b/drivers/gpu/drm/radeon/radeon_atombios.c >> @@ -682,10 +682,18 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct >> uint8_t dac; >> union atom_supported_devices *supported_devices; >> int i, j, max_device; >> - struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; >> + struct bios_connector *bios_connectors; >> + size_t bc_size = sizeof(*bios_connectors) * ATOM_MAX_SUPPORTED_DEVICE; >> >> - if (!atom_parse_data_header(ctx, index,&size,&frev,&crev,&data_offset)) >> + bios_connectors = kzalloc(bc_size, GFP_KERNEL); >> + if (!bios_connectors) >> + return false; >> + >> + if (!atom_parse_data_header(ctx, index,&size,&frev,&crev, >> +&data_offset)) { >> + kfree(bios_connectors); >> return false; >> + } >> >> supported_devices = >> (union atom_supported_devices *)(ctx->bios + data_offset); >> @@ -853,6 +861,7 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct >> >> radeon_link_encoder_connector(dev); >> >> + kfree(bios_connectors); >> return true; >> } >> >> _______________________________________________ >> dri-devel mailing list >> dri-devel@lists.freedesktop.org >> http://lists.freedesktop.org/mailman/listinfo/dri-devel >> >> --------------070405080708060005020408 Content-Type: text/plain; name="drm.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="drm.patch" Fixes linux-next & linux-2.6 checkstack warnings: drivers/gpu/drm/nouveau/nv40_graph.c: In function `nv40_graph_init': drivers/gpu/drm/nouveau/nv40_graph.c:400: warning: the frame size of 1184 bytes is larger than 1024 bytes drivers/gpu/drm/radeon/radeon_atombios.c: In function `radeon_get_atom_connector_info_from_supported_devices_table': drivers/gpu/drm/radeon/radeon_atombios.c:857: warning: the frame size of 1872 bytes is larger than 1024 bytes Signed-off-by: Prarit Bhargava diff --git a/drivers/gpu/drm/nouveau/nv40_graph.c b/drivers/gpu/drm/nouveau/nv40_graph.c index 0616c96..704a25d 100644 --- a/drivers/gpu/drm/nouveau/nv40_graph.c +++ b/drivers/gpu/drm/nouveau/nv40_graph.c @@ -253,7 +253,11 @@ nv40_graph_init(struct drm_device *dev) if (!dev_priv->engine.graph.ctxprog) { struct nouveau_grctx ctx = {}; - uint32_t cp[256]; + uint32_t *cp; + + cp = kmalloc(sizeof(*cp) * 256, GFP_KERNEL); + if (!cp) + return -ENOMEM; ctx.dev = dev; ctx.mode = NOUVEAU_GRCTX_PROG; @@ -265,6 +269,8 @@ nv40_graph_init(struct drm_device *dev) nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_INDEX, 0); for (i = 0; i < ctx.ctxprog_len; i++) nv_wr32(dev, NV40_PGRAPH_CTXCTL_UCODE_DATA, cp[i]); + + kfree(cp); } /* No context present currently */ diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 1d05deb..02697e2 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -682,10 +682,18 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct uint8_t dac; union atom_supported_devices *supported_devices; int i, j, max_device; - struct bios_connector bios_connectors[ATOM_MAX_SUPPORTED_DEVICE]; + struct bios_connector *bios_connectors; + size_t bc_size = sizeof(*bios_connectors) * ATOM_MAX_SUPPORTED_DEVICE; - if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, &data_offset)) + bios_connectors = kzalloc(bc_size, GFP_KERNEL); + if (!bios_connectors) + return false; + + if (!atom_parse_data_header(ctx, index, &size, &frev, &crev, + &data_offset)) { + kfree(bios_connectors); return false; + } supported_devices = (union atom_supported_devices *)(ctx->bios + data_offset); @@ -853,6 +861,7 @@ bool radeon_get_atom_connector_info_from_supported_devices_table(struct radeon_link_encoder_connector(dev); + kfree(bios_connectors); return true; } * Unmerged path localversion-next --------------070405080708060005020408 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 --------------070405080708060005020408--