All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH]: nouveau and radeon checkstack fixes
@ 2010-05-22  0:30 Prarit Bhargava
  2010-05-22 19:57 ` Maarten Maathuis
  0 siblings, 1 reply; 3+ messages in thread
From: Prarit Bhargava @ 2010-05-22  0:30 UTC (permalink / raw)
  To: dri-devel, airlied; +Cc: Prarit Bhargava

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 <prarit@redhat.com>

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;
 
 		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;
 }

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH]: nouveau and radeon checkstack fixes
  2010-05-22  0:30 [PATCH]: nouveau and radeon checkstack fixes Prarit Bhargava
@ 2010-05-22 19:57 ` Maarten Maathuis
  2010-05-22 23:07   ` Prarit Bhargava
  0 siblings, 1 reply; 3+ messages in thread
From: Maarten Maathuis @ 2010-05-22 19:57 UTC (permalink / raw)
  To: Prarit Bhargava; +Cc: dri-devel

On Sat, May 22, 2010 at 2:30 AM, Prarit Bhargava <prarit@redhat.com> 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 <prarit@redhat.com>
>
> 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.

>                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
>

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH]: nouveau and radeon checkstack fixes
  2010-05-22 19:57 ` Maarten Maathuis
@ 2010-05-22 23:07   ` Prarit Bhargava
  0 siblings, 0 replies; 3+ messages in thread
From: Prarit Bhargava @ 2010-05-22 23:07 UTC (permalink / raw)
  To: Maarten Maathuis; +Cc: dri-devel

[-- Attachment #1: Type: text/plain, Size: 3436 bytes --]



On 05/22/2010 03:57 PM, Maarten Maathuis wrote:
> On Sat, May 22, 2010 at 2:30 AM, Prarit Bhargava<prarit@redhat.com>  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<prarit@redhat.com>
>>
>> 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
>>
>>      

[-- Attachment #2: drm.patch --]
[-- Type: text/plain, Size: 2492 bytes --]

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 <prarit@redhat.com>

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

[-- Attachment #3: Type: text/plain, Size: 159 bytes --]

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel

^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-05-22 23:12 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-22  0:30 [PATCH]: nouveau and radeon checkstack fixes Prarit Bhargava
2010-05-22 19:57 ` Maarten Maathuis
2010-05-22 23:07   ` Prarit Bhargava

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.