linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] firmware: ti_sci: fix strncat length check
@ 2017-03-14 21:11 Arnd Bergmann
  2017-03-14 21:19 ` santosh.shilimkar
  0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-03-14 21:11 UTC (permalink / raw)
  To: Nishanth Menon, Tero Kristo, Santosh Shilimkar
  Cc: Arnd Bergmann, Dave Gerlach, linux-arm-kernel, linux-kernel

gcc-7 notices that the length we pass to strncat is wrong:

drivers/firmware/ti_sci.c: In function 'ti_sci_probe':
drivers/firmware/ti_sci.c:204:32: error: specified bound 50 equals the size of the destination [-Werror=stringop-overflow=]

Instead of the total length, we must pass the length of the
remaining space here.

Fixes: aa276781a64a ("firmware: Add basic support for TI System Control Interface (TI-SCI) protocol")
Acked-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
Originally submitted on Jan 11, patch is still needed on Linux-4.11-rc2.
---
 drivers/firmware/ti_sci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 874ff32db366..00cfed3c3e1a 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -202,7 +202,8 @@ static int ti_sci_debugfs_create(struct platform_device *pdev,
 	info->debug_buffer[info->debug_region_size] = 0;
 
 	info->d = debugfs_create_file(strncat(debug_name, dev_name(dev),
-					      sizeof(debug_name)),
+					      sizeof(debug_name) -
+					      sizeof("ti_sci_debug@")),
 				      0444, NULL, info, &ti_sci_debug_fops);
 	if (IS_ERR(info->d))
 		return PTR_ERR(info->d);
-- 
2.9.0

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

* Re: [PATCH] firmware: ti_sci: fix strncat length check
  2017-03-14 21:11 [PATCH] firmware: ti_sci: fix strncat length check Arnd Bergmann
@ 2017-03-14 21:19 ` santosh.shilimkar
  2017-05-19  8:32   ` Arnd Bergmann
  0 siblings, 1 reply; 5+ messages in thread
From: santosh.shilimkar @ 2017-03-14 21:19 UTC (permalink / raw)
  To: Arnd Bergmann, Nishanth Menon, Tero Kristo, Santosh Shilimkar
  Cc: Dave Gerlach, linux-arm-kernel, linux-kernel

On 3/14/17 2:11 PM, Arnd Bergmann wrote:
> gcc-7 notices that the length we pass to strncat is wrong:
>
> drivers/firmware/ti_sci.c: In function 'ti_sci_probe':
> drivers/firmware/ti_sci.c:204:32: error: specified bound 50 equals the size of the destination [-Werror=stringop-overflow=]
>
> Instead of the total length, we must pass the length of the
> remaining space here.
>
> Fixes: aa276781a64a ("firmware: Add basic support for TI System Control Interface (TI-SCI) protocol")
> Acked-by: Nishanth Menon <nm@ti.com>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> Originally submitted on Jan 11, patch is still needed on Linux-4.11-rc2.

Looks fine to me Arnd. Will you be applying it to SOC driver branch ?

Acked-by: Santosh Shilimkar <ssantosh@kernel.org>

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

* Re: [PATCH] firmware: ti_sci: fix strncat length check
  2017-03-14 21:19 ` santosh.shilimkar
@ 2017-05-19  8:32   ` Arnd Bergmann
  0 siblings, 0 replies; 5+ messages in thread
From: Arnd Bergmann @ 2017-05-19  8:32 UTC (permalink / raw)
  To: santosh.shilimkar
  Cc: Nishanth Menon, Tero Kristo, Santosh Shilimkar, Dave Gerlach,
	Linux ARM, Linux Kernel Mailing List, arm-soc

On Tue, Mar 14, 2017 at 10:19 PM, santosh.shilimkar@oracle.com
<santosh.shilimkar@oracle.com> wrote:
> On 3/14/17 2:11 PM, Arnd Bergmann wrote:
>>
>> gcc-7 notices that the length we pass to strncat is wrong:
>>
>> drivers/firmware/ti_sci.c: In function 'ti_sci_probe':
>> drivers/firmware/ti_sci.c:204:32: error: specified bound 50 equals the
>> size of the destination [-Werror=stringop-overflow=]
>>
>> Instead of the total length, we must pass the length of the
>> remaining space here.
>>
>> Fixes: aa276781a64a ("firmware: Add basic support for TI System Control
>> Interface (TI-SCI) protocol")
>> Acked-by: Nishanth Menon <nm@ti.com>
>> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
>> ---
>> Originally submitted on Jan 11, patch is still needed on Linux-4.11-rc2.
>
>
> Looks fine to me Arnd. Will you be applying it to SOC driver branch ?
>
> Acked-by: Santosh Shilimkar <ssantosh@kernel.org>

For some reason I dropped the ball in this patch, applied to arm-soc fixes
now and marked for stable backports.

        Arnd

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

* Re: [PATCH] firmware: ti_sci: fix strncat length check
  2017-01-11 13:37 Arnd Bergmann
@ 2017-01-11 14:29 ` Nishanth Menon
  0 siblings, 0 replies; 5+ messages in thread
From: Nishanth Menon @ 2017-01-11 14:29 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Tero Kristo, Santosh Shilimkar, lkml, linux-arm-kernel, Dave Gerlach

On Wed, Jan 11, 2017 at 7:37 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> gcc-7 notices that the length we pass to strncat is wrong:
>
> drivers/firmware/ti_sci.c: In function 'ti_sci_probe':
> drivers/firmware/ti_sci.c:204:32: error: specified bound 50 equals the size of the destination [-Werror=stringop-overflow=]
>
> Instead of the total length, we must pass the length of the
> remaining space here.
>
> Fixes: aa276781a64a ("firmware: Add basic support for TI System Control Interface (TI-SCI) protocol")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/firmware/ti_sci.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
> index 874ff32db366..00cfed3c3e1a 100644
> --- a/drivers/firmware/ti_sci.c
> +++ b/drivers/firmware/ti_sci.c
> @@ -202,7 +202,8 @@ static int ti_sci_debugfs_create(struct platform_device *pdev,
>         info->debug_buffer[info->debug_region_size] = 0;
>
>         info->d = debugfs_create_file(strncat(debug_name, dev_name(dev),
> -                                             sizeof(debug_name)),
> +                                             sizeof(debug_name) -
> +                                             sizeof("ti_sci_debug@")),
>                                       0444, NULL, info, &ti_sci_debug_fops);
>         if (IS_ERR(info->d))
>                 return PTR_ERR(info->d);

Aargh.. thanks.... Santosh: if you could pick this up.. using
strlen(debug_name) might be an overkill here.

Acked-by: Nishanth Menon <nm@ti.com>

---
Regards,
Nishanth Menon

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

* [PATCH] firmware: ti_sci: fix strncat length check
@ 2017-01-11 13:37 Arnd Bergmann
  2017-01-11 14:29 ` Nishanth Menon
  0 siblings, 1 reply; 5+ messages in thread
From: Arnd Bergmann @ 2017-01-11 13:37 UTC (permalink / raw)
  To: Nishanth Menon, Tero Kristo, Santosh Shilimkar
  Cc: Arnd Bergmann, Dave Gerlach, linux-arm-kernel, linux-kernel

gcc-7 notices that the length we pass to strncat is wrong:

drivers/firmware/ti_sci.c: In function 'ti_sci_probe':
drivers/firmware/ti_sci.c:204:32: error: specified bound 50 equals the size of the destination [-Werror=stringop-overflow=]

Instead of the total length, we must pass the length of the
remaining space here.

Fixes: aa276781a64a ("firmware: Add basic support for TI System Control Interface (TI-SCI) protocol")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/firmware/ti_sci.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/ti_sci.c b/drivers/firmware/ti_sci.c
index 874ff32db366..00cfed3c3e1a 100644
--- a/drivers/firmware/ti_sci.c
+++ b/drivers/firmware/ti_sci.c
@@ -202,7 +202,8 @@ static int ti_sci_debugfs_create(struct platform_device *pdev,
 	info->debug_buffer[info->debug_region_size] = 0;
 
 	info->d = debugfs_create_file(strncat(debug_name, dev_name(dev),
-					      sizeof(debug_name)),
+					      sizeof(debug_name) -
+					      sizeof("ti_sci_debug@")),
 				      0444, NULL, info, &ti_sci_debug_fops);
 	if (IS_ERR(info->d))
 		return PTR_ERR(info->d);
-- 
2.9.0

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

end of thread, other threads:[~2017-05-19  8:32 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-14 21:11 [PATCH] firmware: ti_sci: fix strncat length check Arnd Bergmann
2017-03-14 21:19 ` santosh.shilimkar
2017-05-19  8:32   ` Arnd Bergmann
  -- strict thread matches above, loose matches on Subject: below --
2017-01-11 13:37 Arnd Bergmann
2017-01-11 14:29 ` Nishanth Menon

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).