: Use kmemdup & kzalloc where applicable
Subsystems (3)
PATCH 2/11 : Use kmemdup & kzalloc where applicable
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- net/atm/lec.c | 10 +++------- net/atm/mpc.c | 3 +-- net/atm/mpoa_caches.c | 6 ++---- 3 files changed, 6 insertions(+), 13 deletions(-)
net/atm/lec.c +3 -7
@@ -1321,11 +1321,10 @@ static int lane2_resolve(struct net_deviif (table ==NULL )return -1 ; - *tlvs =kmalloc (table->sizeoftlvs,GFP_ATOMIC ); + *tlvs =kmemdup (table->tlvs, table->sizeoftlvs,GFP_ATOMIC );if (*tlvs ==NULL )return -1 ; -memcpy (*tlvs, table->tlvs, table->sizeoftlvs); *sizeoftlvs = table->sizeoftlvs;return 0 ;
@@ -1364,11 +1363,10 @@ static int lane2_associate_req(struct nekfree (priv->tlvs);/* NULL if there was no previous association */ - priv->tlvs =kmalloc (sizeoftlvs,GFP_KERNEL ); + priv->tlvs =kmemdup (tlvs, sizeoftlvs,GFP_KERNEL );if (priv->tlvs ==NULL )return (0 ); priv->sizeoftlvs = sizeoftlvs; -memcpy (priv->tlvs, tlvs, sizeoftlvs); skb =alloc_skb (sizeoftlvs,GFP_ATOMIC );if (skb ==NULL )
@@ -1409,12 +1407,10 @@ #if 0 /*kfree (entry->tlvs); - entry->tlvs =kmalloc (sizeoftlvs,GFP_KERNEL ); + entry->tlvs =kmemdup (tlvs, sizeoftlvs,GFP_KERNEL );if (entry->tlvs ==NULL )return ; - entry->sizeoftlvs = sizeoftlvs; -memcpy (entry->tlvs, tlvs, sizeoftlvs);#endif #if 0 printk ("lec.c: lane2_associate_ind()\n" );
net/atm/mpc.c +1 -2
@@ -1322,13 +1322,12 @@ static void set_mps_mac_addr_rcvd(structif (client->number_of_mps_macs)kfree (client->mps_macs); client->number_of_mps_macs =0 ; - client->mps_macs =kmalloc (ETH_ALEN ,GFP_KERNEL ); + client->mps_macs =kmemdup (msg->MPS_ctrl,ETH_ALEN ,GFP_KERNEL );if (client->mps_macs ==NULL ) {printk ("mpoa: set_mps_mac_addr_rcvd: out of memory\n" );return ; } client->number_of_mps_macs =1 ; -memcpy (client->mps_macs, msg->MPS_ctrl,ETH_ALEN );return ; }
net/atm/mpoa_caches.c +2 -4
@@ -87,7 +87,7 @@ static in_cache_entry *in_cache_get_by_vstatic in_cache_entry *in_cache_add_entry (__be32 dst_ip,struct mpoa_client *client) { -in_cache_entry * entry =kmalloc (sizeof (in_cache_entry),GFP_KERNEL ); +in_cache_entry *entry =kzalloc (sizeof (in_cache_entry),GFP_KERNEL );if (entry ==NULL ) {printk ("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n" );
@@ -95,7 +95,6 @@ static in_cache_entry *in_cache_add_entr }dprintk ("mpoa: mpoa_caches.c: adding an ingress entry, ip = %u.%u.%u.%u\n" ,NIPQUAD (dst_ip)); -memset (entry,0 ,sizeof (in_cache_entry));atomic_set (&entry->use,1 );dprintk ("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n" );
@@ -447,7 +446,7 @@ static void eg_cache_remove_entry(eg_cacstatic eg_cache_entry *eg_cache_add_entry (struct k_message *msg,struct mpoa_client *client) { -eg_cache_entry *entry =kmalloc (sizeof (eg_cache_entry),GFP_KERNEL ); +eg_cache_entry *entry =kzalloc (sizeof (eg_cache_entry),GFP_KERNEL );if (entry ==NULL ) {printk ("mpoa: mpoa_caches.c: new_eg_cache_entry: out of memory\n" );
@@ -455,7 +454,6 @@ static eg_cache_entry *eg_cache_add_entr }dprintk ("mpoa: mpoa_caches.c: adding an egress entry, ip = %u.%u.%u.%u, this should be our IP\n" ,NIPQUAD (msg->content.eg_info.eg_dst_ip)); -memset (entry,0 ,sizeof (eg_cache_entry));atomic_set (&entry->use,1 );dprintk ("mpoa: mpoa_caches.c: new_eg_cache_entry: about to lock\n" );
Signature · 1 line
1.4.2.1.g3d5c