[PATCH] net: dsa: felix: use kmemdup() to replace kmalloc + memcpy
flat view
STALE1776d
LANDED
From: Yihao Han <hidden>
Date: 2021-12-07 06:44:45
Also in:
lkml
Subsystem:
networking drivers, networking [dsa], ocelot ethernet switch driver, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Andrew Lunn, Vladimir Oltean, Vladimir Oltean, Linus Torvalds
Landed in mainline as e44aecc709ad on 2021-12-08.
Fix following coccicheck warning: /drivers/net/dsa/ocelot/felix_vsc9959.c:1627:13-20: WARNING opportunity for kmemdup /drivers/net/dsa/ocelot/felix_vsc9959.c:1506:16-23: WARNING opportunity for kmemdup Signed-off-by: Yihao Han <redacted> --- drivers/net/dsa/ocelot/felix_vsc9959.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
index 9add86eda7e3..0076420308a7 100644
--- a/drivers/net/dsa/ocelot/felix_vsc9959.c
+++ b/drivers/net/dsa/ocelot/felix_vsc9959.c@@ -1503,12 +1503,10 @@ static int vsc9959_stream_table_add(struct ocelot *ocelot, struct felix_stream *stream_entry; int ret; - stream_entry = kzalloc(sizeof(*stream_entry), GFP_KERNEL); + stream_entry = kmemdup(stream, sizeof(*stream_entry), GFP_KERNEL); if (!stream_entry) return -ENOMEM; - memcpy(stream_entry, stream, sizeof(*stream_entry)); - if (!stream->dummy) { ret = vsc9959_mact_stream_set(ocelot, stream_entry, extack); if (ret) {
@@ -1624,11 +1622,10 @@ static int vsc9959_psfp_sfi_list_add(struct ocelot *ocelot, struct felix_stream_filter *sfi_entry; int ret; - sfi_entry = kzalloc(sizeof(*sfi_entry), GFP_KERNEL); + sfi_entry = kmemdup(sfi, sizeof(*sfi_entry), GFP_KERNEL); if (!sfi_entry) return -ENOMEM; - memcpy(sfi_entry, sfi, sizeof(*sfi_entry)); refcount_set(&sfi_entry->refcount, 1); ret = vsc9959_psfp_sfi_set(ocelot, sfi_entry);
--
2.17.1