Unverified Commit 63db5acb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-drivers-for-v5.15-tag2' of... 

Merge tag 'renesas-drivers-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers

Renesas driver updates for v5.15 (take two)

  - Prefer memcpy() over strcpy().

* tag 'renesas-drivers-for-v5.15-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Prefer memcpy() over strcpy()

Link: https://lore.kernel.org/r/cover.1628849625.git.geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c4361dee 148bcca9

drivers/soc/renesas/r8a779a0-sysc.c

+4 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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;