* [PATCH] drm/ttm: Use scnprintf() for avoiding potential buffer overflow
@ 2020-03-11 7:34 Takashi Iwai
2020-03-11 7:52 ` Huang Rui
0 siblings, 1 reply; 4+ messages in thread
From: Takashi Iwai @ 2020-03-11 7:34 UTC (permalink / raw)
To: Christian Koenig; +Cc: Huang Rui, dri-devel
Since snprintf() returns the would-be-output size instead of the
actual output size, the succeeding calls may go beyond the given
buffer limit. Fix it by replacing with scnprintf().
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
index bf876faea592..faefaaef7909 100644
--- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
+++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
@@ -604,7 +604,7 @@ static struct dma_pool *ttm_dma_pool_init(struct device *dev, gfp_t flags,
p = pool->name;
for (i = 0; i < ARRAY_SIZE(t); i++) {
if (type & t[i]) {
- p += snprintf(p, sizeof(pool->name) - (p - pool->name),
+ p += scnprintf(p, sizeof(pool->name) - (p - pool->name),
"%s", n[i]);
}
}
--
2.16.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/ttm: Use scnprintf() for avoiding potential buffer overflow
2020-03-11 7:34 [PATCH] drm/ttm: Use scnprintf() for avoiding potential buffer overflow Takashi Iwai
@ 2020-03-11 7:52 ` Huang Rui
2020-03-11 7:56 ` Christian König
0 siblings, 1 reply; 4+ messages in thread
From: Huang Rui @ 2020-03-11 7:52 UTC (permalink / raw)
To: Takashi Iwai; +Cc: Koenig, Christian, dri-devel
On Wed, Mar 11, 2020 at 03:34:52PM +0800, Takashi Iwai wrote:
> Since snprintf() returns the would-be-output size instead of the
> actual output size, the succeeding calls may go beyond the given
> buffer limit. Fix it by replacing with scnprintf().
>
> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Huang Rui <ray.huang@amd.com>
> ---
> drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> index bf876faea592..faefaaef7909 100644
> --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> @@ -604,7 +604,7 @@ static struct dma_pool *ttm_dma_pool_init(struct device *dev, gfp_t flags,
> p = pool->name;
> for (i = 0; i < ARRAY_SIZE(t); i++) {
> if (type & t[i]) {
> - p += snprintf(p, sizeof(pool->name) - (p - pool->name),
> + p += scnprintf(p, sizeof(pool->name) - (p - pool->name),
> "%s", n[i]);
> }
> }
> --
> 2.16.4
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/ttm: Use scnprintf() for avoiding potential buffer overflow
2020-03-11 7:52 ` Huang Rui
@ 2020-03-11 7:56 ` Christian König
2020-03-11 7:57 ` Takashi Iwai
0 siblings, 1 reply; 4+ messages in thread
From: Christian König @ 2020-03-11 7:56 UTC (permalink / raw)
To: Huang Rui, Takashi Iwai; +Cc: dri-devel
Am 11.03.20 um 08:52 schrieb Huang Rui:
> On Wed, Mar 11, 2020 at 03:34:52PM +0800, Takashi Iwai wrote:
>> Since snprintf() returns the would-be-output size instead of the
>> actual output size, the succeeding calls may go beyond the given
>> buffer limit. Fix it by replacing with scnprintf().
>>
>> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> Reviewed-by: Huang Rui <ray.huang@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Takashi, should I push this to drm-misc-next or do you want to merge
that somehow else?
Thanks,
Christian.
>
>> ---
>> drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
>> index bf876faea592..faefaaef7909 100644
>> --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
>> +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
>> @@ -604,7 +604,7 @@ static struct dma_pool *ttm_dma_pool_init(struct device *dev, gfp_t flags,
>> p = pool->name;
>> for (i = 0; i < ARRAY_SIZE(t); i++) {
>> if (type & t[i]) {
>> - p += snprintf(p, sizeof(pool->name) - (p - pool->name),
>> + p += scnprintf(p, sizeof(pool->name) - (p - pool->name),
>> "%s", n[i]);
>> }
>> }
>> --
>> 2.16.4
>>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] drm/ttm: Use scnprintf() for avoiding potential buffer overflow
2020-03-11 7:56 ` Christian König
@ 2020-03-11 7:57 ` Takashi Iwai
0 siblings, 0 replies; 4+ messages in thread
From: Takashi Iwai @ 2020-03-11 7:57 UTC (permalink / raw)
To: Christian K6nig; +Cc: Huang Rui, dri-devel
On Wed, 11 Mar 2020 08:56:11 +0100,
Christian K6nig wrote:
>
> Am 11.03.20 um 08:52 schrieb Huang Rui:
> > On Wed, Mar 11, 2020 at 03:34:52PM +0800, Takashi Iwai wrote:
> >> Since snprintf() returns the would-be-output size instead of the
> >> actual output size, the succeeding calls may go beyond the given
> >> buffer limit. Fix it by replacing with scnprintf().
> >>
> >> Signed-off-by: Takashi Iwai <tiwai@suse.de>
> > Reviewed-by: Huang Rui <ray.huang@amd.com>
>
> Reviewed-by: Christian König <christian.koenig@amd.com>
>
> Takashi, should I push this to drm-misc-next or do you want to merge
> that somehow else?
Please take through your tree as you like.
Thanks!
Takashi
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-03-11 7:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-03-11 7:34 [PATCH] drm/ttm: Use scnprintf() for avoiding potential buffer overflow Takashi Iwai
2020-03-11 7:52 ` Huang Rui
2020-03-11 7:56 ` Christian König
2020-03-11 7:57 ` Takashi Iwai
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.