Merge tag 'jfs-5.6' of git://github.com/kleikamp/linux-shaggy

[linux.git] / net / core / drop_monitor.c

diff --git a/net/core/drop_monitor.c b/net/core/drop_monitor.c
index 536e032d95c8f64dda0db81dde672a87466ce03d..ea46fc6aa883b97576d416d6684505bae7dc9843 100644 (file)
--- a/net/core/drop_monitor.c
+++ b/net/core/drop_monitor.c
@@ -802,16 +802,12 @@ net_dm_hw_metadata_clone(const struct net_dm_hw_metadata *hw_metadata)
        if (!n_hw_metadata)
                return NULL;
 
-       trap_group_name = kmemdup(hw_metadata->trap_group_name,
-                                 strlen(hw_metadata->trap_group_name) + 1,
-                                 GFP_ATOMIC | __GFP_ZERO);
+       trap_group_name = kstrdup(hw_metadata->trap_group_name, GFP_ATOMIC);
        if (!trap_group_name)
                goto free_hw_metadata;
        n_hw_metadata->trap_group_name = trap_group_name;
 
-       trap_name = kmemdup(hw_metadata->trap_name,
-                           strlen(hw_metadata->trap_name) + 1,
-                           GFP_ATOMIC | __GFP_ZERO);
+       trap_name = kstrdup(hw_metadata->trap_name, GFP_ATOMIC);
        if (!trap_name)
                goto free_trap_group;
        n_hw_metadata->trap_name = trap_name;