All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] drm/ttm: make sure format string cannot leak in
@ 2014-09-11 20:53 Kees Cook
  2014-09-12  8:28   ` David Herrmann
  0 siblings, 1 reply; 3+ messages in thread
From: Kees Cook @ 2014-09-11 20:53 UTC (permalink / raw)
  To: linux-kernel; +Cc: David Airlie, dri-devel

While zone->name is currently hard coded, the call to kobject_init_and_add()
should follow the more defensive argument list usage (as already done in
other places in ttm_memory.c) where "%s" is used instead of directly passing
in a variable as a format string.

Signed-off-by: Kees Cook <keescook@chromium.org>
---
 drivers/gpu/drm/ttm/ttm_memory.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
index fa53df487875..1e688b603e46 100644
--- a/drivers/gpu/drm/ttm/ttm_memory.c
+++ b/drivers/gpu/drm/ttm/ttm_memory.c
@@ -300,7 +300,8 @@ static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob,
 	zone->glob = glob;
 	glob->zone_highmem = zone;
 	ret = kobject_init_and_add(
-		&zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
+		&zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s",
+		zone->name);
 	if (unlikely(ret != 0)) {
 		kobject_put(&zone->kobj);
 		return ret;
-- 
1.9.1


-- 
Kees Cook
Chrome OS Security

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] drm/ttm: make sure format string cannot leak in
  2014-09-11 20:53 [PATCH] drm/ttm: make sure format string cannot leak in Kees Cook
@ 2014-09-12  8:28   ` David Herrmann
  0 siblings, 0 replies; 3+ messages in thread
From: David Herrmann @ 2014-09-12  8:28 UTC (permalink / raw)
  To: Kees Cook; +Cc: linux-kernel, David Airlie, dri-devel

Hi

On Thu, Sep 11, 2014 at 10:53 PM, Kees Cook <keescook@chromium.org> wrote:
> While zone->name is currently hard coded, the call to kobject_init_and_add()
> should follow the more defensive argument list usage (as already done in
> other places in ttm_memory.c) where "%s" is used instead of directly passing
> in a variable as a format string.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Thanks
David

> ---
>  drivers/gpu/drm/ttm/ttm_memory.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
> index fa53df487875..1e688b603e46 100644
> --- a/drivers/gpu/drm/ttm/ttm_memory.c
> +++ b/drivers/gpu/drm/ttm/ttm_memory.c
> @@ -300,7 +300,8 @@ static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob,
>         zone->glob = glob;
>         glob->zone_highmem = zone;
>         ret = kobject_init_and_add(
> -               &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
> +               &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s",
> +               zone->name);
>         if (unlikely(ret != 0)) {
>                 kobject_put(&zone->kobj);
>                 return ret;
> --
> 1.9.1
>
>
> --
> Kees Cook
> Chrome OS Security
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] drm/ttm: make sure format string cannot leak in
@ 2014-09-12  8:28   ` David Herrmann
  0 siblings, 0 replies; 3+ messages in thread
From: David Herrmann @ 2014-09-12  8:28 UTC (permalink / raw)
  To: Kees Cook; +Cc: linux-kernel, dri-devel

Hi

On Thu, Sep 11, 2014 at 10:53 PM, Kees Cook <keescook@chromium.org> wrote:
> While zone->name is currently hard coded, the call to kobject_init_and_add()
> should follow the more defensive argument list usage (as already done in
> other places in ttm_memory.c) where "%s" is used instead of directly passing
> in a variable as a format string.
>
> Signed-off-by: Kees Cook <keescook@chromium.org>

Reviewed-by: David Herrmann <dh.herrmann@gmail.com>

Thanks
David

> ---
>  drivers/gpu/drm/ttm/ttm_memory.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_memory.c b/drivers/gpu/drm/ttm/ttm_memory.c
> index fa53df487875..1e688b603e46 100644
> --- a/drivers/gpu/drm/ttm/ttm_memory.c
> +++ b/drivers/gpu/drm/ttm/ttm_memory.c
> @@ -300,7 +300,8 @@ static int ttm_mem_init_highmem_zone(struct ttm_mem_global *glob,
>         zone->glob = glob;
>         glob->zone_highmem = zone;
>         ret = kobject_init_and_add(
> -               &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, zone->name);
> +               &zone->kobj, &ttm_mem_zone_kobj_type, &glob->kobj, "%s",
> +               zone->name);
>         if (unlikely(ret != 0)) {
>                 kobject_put(&zone->kobj);
>                 return ret;
> --
> 1.9.1
>
>
> --
> Kees Cook
> Chrome OS Security
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2014-09-12  8:28 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-11 20:53 [PATCH] drm/ttm: make sure format string cannot leak in Kees Cook
2014-09-12  8:28 ` David Herrmann
2014-09-12  8:28   ` David Herrmann

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.