drivers/soc: Remove all strcpy() uses
Subsystems (4)
v4 cover drivers/soc: Remove all strcpy() uses
strcpy() performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. So use strscpy() or memcpy() as a safe replacement.
This is a task of the KSPP [1].
Changelog v1 -> v2
- Change the "area_name_size" variable for a shorter name (Geert Uytterhoeven).
- Add the "Reviewed-by: Geert Uytterhoeven" tag.
- Use the memcpy function instead of strscpy function when the size of the destination buffer cannot be obtained with "sizeof" (David Laight, Robin Murphy).
Changelog v2 -> v3
- Remove the "Reviewed-by: Geert Uytterhoeven" tag since the code has changed after the v1 review (use of memcpy instead of strscpy).
Changelog v3 -> v4
- Split the changes in 3 commits (Bjorn Andersson).
- Don't break a long line (Bjorn Andersson).
- Reword the commit when used the memcpy function (Bjorn Andersson)
The previous version can be found here [2].
[1] https://github.com/KSPP/linux/issues/88
[2] https://lore.kernel.org/linux-hardening/[email protected]/
Len Baker (3):
drivers/soc/qcom: Prefer strscpy over strcpy
drivers/soc/renesas: Prefer memcpy over strcpy
drivers/soc/ti: Prefer strscpy over strcpy
drivers/soc/qcom/pdr_interface.c | 12 ++++++------ drivers/soc/renesas/r8a779a0-sysc.c | 6 ++++-- drivers/soc/renesas/rcar-sysc.c | 6 ++++-- drivers/soc/ti/knav_dma.c | 2 +- 4 files changed, 15 insertions(+), 11 deletions(-)
--
2.25.1
PATCH v4 1/3 drivers/soc/qcom: Prefer strscpy over strcpy
strcpy() performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. The safe replacement is strscpy().
This is a previous step in the path to remove the strcpy() function entirely from the kernel.
--- drivers/soc/qcom/pdr_interface.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/soc/qcom/pdr_interface.c +6 -6
@@ -131,7 +131,7 @@ static int pdr_register_listener(struct pdr_handle *pdr,return ret; req.enable = enable; -strcpy (req.service_path, pds->service_path); +strscpy (req.service_path, pds->service_path,sizeof (req.service_path)); ret = qmi_send_request(&pdr->notifier_hdl, &pds->addr, &txn, SERVREG_REGISTER_LISTENER_REQ,
@@ -257,7 +257,7 @@ static int pdr_send_indack_msg(struct pdr_handle *pdr, struct pdr_service *pds,return ret; req.transaction_id = tid; -strcpy (req.service_path, pds->service_path); +strscpy (req.service_path, pds->service_path,sizeof (req.service_path)); ret = qmi_send_request(&pdr->notifier_hdl, &pds->addr, &txn, SERVREG_SET_ACK_REQ,
@@ -406,7 +406,7 @@ static int pdr_locate_service(struct pdr_handle *pdr, struct pdr_service *pds)return -ENOMEM ;/* Prepare req message */ -strcpy (req.service_name, pds->service_name); +strscpy (req.service_name, pds->service_name,sizeof (req.service_name)); req.domain_offset_valid = true; req.domain_offset =0 ;
@@ -531,8 +531,8 @@ struct pdr_service *pdr_add_lookup(struct pdr_handle *pdr,return ERR_PTR (-ENOMEM ); pds->service =SERVREG_NOTIFIER_SERVICE ; -strcpy (pds->service_name, service_name); -strcpy (pds->service_path, service_path); +strscpy (pds->service_name, service_name,sizeof (pds->service_name)); +strscpy (pds->service_path, service_path,sizeof (pds->service_path)); pds->need_locator_lookup = true;mutex_lock (&pdr->list_lock);
@@ -587,7 +587,7 @@ int pdr_restart_pd(struct pdr_handle *pdr, struct pdr_service *pds)break ;/* Prepare req message */ -strcpy (req.service_path, pds->service_path); +strscpy (req.service_path, pds->service_path,sizeof (req.service_path)); addr = pds->addr;break ; }
--
2.25.1
PATCH v4 2/3 drivers/soc/renesas: Prefer memcpy over strcpy
In reply to Len Bakerstrcpy() performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. So, use memcpy() as a safe replacement.
This is a previous step in the path to remove the strcpy() function entirely from the kernel.
--- drivers/soc/renesas/r8a779a0-sysc.c | 6 ++++-- drivers/soc/renesas/rcar-sysc.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)
drivers/soc/renesas/r8a779a0-sysc.c +4 -2
@@ -404,19 +404,21 @@ static int __init r8a779a0_sysc_pd_init(void)for (i =0 ; i < info->num_areas; i++) {const struct r8a779a0_sysc_area *area = &info->areas[i];struct r8a779a0_sysc_pd *pd; +size_t n;if (!area->name) {/* Skip NULLified area */ continue ; } - pd =kzalloc (sizeof (*pd) +strlen (area->name) +1 ,GFP_KERNEL ); + n =strlen (area->name) +1 ; + pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );if (!pd) { error = -ENOMEM ; goto out_put; } -strcpy (pd->name, area->name); +memcpy (pd->name, area->name, n); pd->genpd.name = pd->name; pd->pdr = area->pdr; pd->flags = area->flags;
drivers/soc/renesas/rcar-sysc.c +4 -2
@@ -396,19 +396,21 @@ static int __init rcar_sysc_pd_init(void)for (i =0 ; i < info->num_areas; i++) {const struct rcar_sysc_area *area = &info->areas[i];struct rcar_sysc_pd *pd; +size_t n;if (!area->name) {/* Skip NULLified area */ continue ; } - pd =kzalloc (sizeof (*pd) +strlen (area->name) +1 ,GFP_KERNEL ); + n =strlen (area->name) +1 ; + pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );if (!pd) { error = -ENOMEM ; goto out_put; } -strcpy (pd->name, area->name); +memcpy (pd->name, area->name, n); pd->genpd.name = pd->name; pd->ch.chan_offs = area->chan_offs; pd->ch.chan_bit = area->chan_bit;
--
2.25.1
Re: [PATCH v4 2/3] drivers/soc/renesas: Prefer memcpy over strcpy
Hi all!
Quoted 20 lines · Len Baker
strcpy()performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. So, usememcpy()as a safe replacement.This is a previous step in the path to remove the
strcpy()function entirely from the kernel.Signed-off-by Len Baker <[email protected]>--- drivers/soc/renesas/r8a779a0-sysc.c | 6 ++++-- drivers/soc/renesas/rcar-sysc.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)drivers/soc/renesas/r8a779a0-sysc.c +0
-0@@ -404,19 +404,21 @@ static int __init r8a779a0_sysc_pd_init(void)for (i =0 ; i < info->num_areas; i++) {const struct r8a779a0_sysc_area *area = &info->areas[i];
drivers/soc/renesas/r8a779a0-sysc.c static int __init r8a779a0_sysc_pd_init(void) · line 414
Quoted 10 lines
drivers/soc/renesas/r8a779a0-sysc.c +2
-1struct r8a779a0_sysc_pd *pd; +size_t n;if (!area->name) {/* Skip NULLified area */ continue ; } - pd =kzalloc (sizeof (*pd) +strlen (area->name) +1 ,GFP_KERNEL )> + n =strlen (area->name) +1 ; + pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );
Zeroing the allocated bytes is not needed since it's completly overwritten with the strcpy()/memcpy().
drivers/soc/renesas/r8a779a0-sysc.c static int __init r8a779a0_sysc_pd_init(void) · line 424
Quoted 10 lines
drivers/soc/renesas/r8a779a0-sysc.c +1
-1if (!pd) { error = -ENOMEM ; goto out_put; } -strcpy (pd->name, area->name); +memcpy (pd->name, area->name, n); pd->genpd.name = pd->name; pd->pdr = area->pdr; pd->flags = area->flags;
And similar for the second hunk.
MfG,
Bernd
Signature · 8 lines
Bernd Petrovitsch Email : [email protected] There is NO CLOUD, just other people's computers. - FSFE LUGA : http://www.luga.at _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH v4 2/3] drivers/soc/renesas: Prefer memcpy over strcpy
Hi,
Le 08/08/2021 à 17:35, Bernd Petrovitsch a écrit :
Quoted 31 lines
Hi all!
Quoted 28 lines · Len Baker
strcpy()performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. So, usememcpy()as a safe replacement.This is a previous step in the path to remove the
strcpy()function entirely from the kernel.Signed-off-by Len Baker <[email protected]>--- drivers/soc/renesas/r8a779a0-sysc.c | 6 ++++-- drivers/soc/renesas/rcar-sysc.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)drivers/soc/renesas/r8a779a0-sysc.c +1
-0@@ -404,19 +404,21 @@ static int __init r8a779a0_sysc_pd_init(void)for (i =0 ; i < info->num_areas; i++) {const struct r8a779a0_sysc_area *area = &info->areas[i];struct r8a779a0_sysc_pd *pd; +size_t n;if (!area->name) {/* Skip NULLified area */ continue ; }
Quoted 5 lines
drivers/soc/renesas/r8a779a0-sysc.c static int __init r8a779a0_sysc_pd_init(void) · line 415
Quoted 3 lines
drivers/soc/renesas/r8a779a0-sysc.c +2
-1- pd =kzalloc (sizeof (*pd) +strlen (area->name) +1 ,GFP_KERNEL ); + n =strlen (area->name) +1 ; + pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );Zeroing the allocated bytes is not needed since it's completly overwritten with the strcpy()/memcpy().
The strcpy()/memcpy() only overwrites the pd->name field, not the whole pd structure. I think that it is needed to keep the kzalloc.
Just my 2c,
CJ
Quoted 16 lines
drivers/soc/renesas/r8a779a0-sysc.c static int __init r8a779a0_sysc_pd_init(void) · line 424
Quoted 10 lines
drivers/soc/renesas/r8a779a0-sysc.c +1
-1if (!pd) { error = -ENOMEM ; goto out_put; } -strcpy (pd->name, area->name); +memcpy (pd->name, area->name, n); pd->genpd.name = pd->name; pd->pdr = area->pdr; pd->flags = area->flags;And similar for the second hunk.
MfG,
Bernd
Re: [PATCH v4 2/3] drivers/soc/renesas: Prefer memcpy over strcpy
Hi,
Quoted 34 lines · Christophe JAILLET
Hi,
Le 08/08/2021 à 17:35, Bernd Petrovitsch a écrit :
Quoted 31 lines
Hi all!
Quoted 28 lines · Len Baker
strcpy()performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. So, usememcpy()as a safe replacement.This is a previous step in the path to remove the
strcpy()function entirely from the kernel.Signed-off-by Len Baker <[email protected]>--- drivers/soc/renesas/r8a779a0-sysc.c | 6 ++++-- drivers/soc/renesas/rcar-sysc.c | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-)drivers/soc/renesas/r8a779a0-sysc.c +1
-0@@ -404,19 +404,21 @@ static int __init r8a779a0_sysc_pd_init(void)for (i =0 ; i < info->num_areas; i++) {const struct r8a779a0_sysc_area *area = &info->areas[i];struct r8a779a0_sysc_pd *pd; +size_t n;if (!area->name) {/* Skip NULLified area */ continue ; }
Quoted 8 lines
Quoted 5 lines
drivers/soc/renesas/r8a779a0-sysc.c static int __init r8a779a0_sysc_pd_init(void) · line 415
Quoted 3 lines
drivers/soc/renesas/r8a779a0-sysc.c +2
-1- pd =kzalloc (sizeof (*pd) +strlen (area->name) +1 ,GFP_KERNEL ); + n =strlen (area->name) +1 ; + pd =kzalloc (sizeof (*pd) + n,GFP_KERNEL );Zeroing the allocated bytes is not needed since it's completly overwritten with the strcpy()/memcpy().
The strcpy()/memcpy() only overwrites the
pd->namefield, not the whole pd structure.
You are right.
Quoted 1 line
I think that it is needed to keep the kzalloc.
Yes, I think so. The kzalloc is needed to guarantee that the whole struct is initialize (all the members are initialized with zeros).
Regards,
Len
Quoted 21 lines
Just my 2c,
CJQuoted 16 lines
drivers/soc/renesas/r8a779a0-sysc.c static int __init r8a779a0_sysc_pd_init(void) · line 424
Quoted 10 lines
drivers/soc/renesas/r8a779a0-sysc.c +1
-1if (!pd) { error = -ENOMEM ; goto out_put; } -strcpy (pd->name, area->name); +memcpy (pd->name, area->name, n); pd->genpd.name = pd->name; pd->pdr = area->pdr; pd->flags = area->flags;And similar for the second hunk.
MfG,
Bernd
Re: [PATCH v4 2/3] drivers/soc/renesas: Prefer memcpy over strcpy
In reply to Len BakerQuoted 8 lines · Len Baker
strcpy()performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. So, usememcpy()as a safe replacement.This is a previous step in the path to remove the
strcpy()function entirely from the kernel.Signed-off-by Len Baker <[email protected]>
i.e. will queue in renesas-devel for v5.15.
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
PATCH v4 3/3 drivers/soc/ti: Prefer strscpy over strcpy
In reply to Len Bakerstrcpy() performs no bounds checking on the destination buffer. This could result in linear overflows beyond the end of the buffer, leading to all kinds of misbehaviors. The safe replacement is strscpy().
This is a previous step in the path to remove the strcpy() function entirely from the kernel.
--- drivers/soc/ti/knav_dma.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/ti/knav_dma.c +1 -1
@@ -691,7 +691,7 @@ static int dma_init(struct device_node *cloud, struct device_node *dma_node) dma->max_rx_flow = max_rx_flow; dma->max_tx_chan =min (max_tx_chan, max_tx_sched);atomic_set (&dma->ref_count,0 ); -strcpy (dma->name, node->name); +strscpy (dma->name, node->name,sizeof (dma->name));spin_lock_init (&dma->lock);for (i =0 ; i < dma->max_tx_chan; i++) {
--
2.25.1