Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[ATM]: Use kmemdup & kzalloc where applicable

Browse Source 
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2006-11-21 01:14:33 -02:00 committed by David S. Miller
parent 66625984ca
commit 2afe37cdff
3 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/atm/lec.c
View File

@ -1321,11 +1321,10 @@ static int lane2_resolve(struct net_device *dev, u8 *dst_mac, int force,
if (table == NULL) if (table == NULL)
return -1; return -1;
*tlvs = kmalloc(table->sizeoftlvs, GFP_ATOMIC); *tlvs = kmemdup(table->tlvs, table->sizeoftlvs, GFP_ATOMIC);
if (*tlvs == NULL) if (*tlvs == NULL)
return -1; return -1;
memcpy(*tlvs, table->tlvs, table->sizeoftlvs);
*sizeoftlvs = table->sizeoftlvs; *sizeoftlvs = table->sizeoftlvs;
return 0; return 0;
@ -1364,11 +1363,10 @@ static int lane2_associate_req(struct net_device *dev, u8 *lan_dst,
kfree(priv->tlvs); /* NULL if there was no previous association */ kfree(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) if (priv->tlvs == NULL)
return (0); return (0);
priv->sizeoftlvs = sizeoftlvs; priv->sizeoftlvs = sizeoftlvs;
memcpy(priv->tlvs, tlvs, sizeoftlvs);
skb = alloc_skb(sizeoftlvs, GFP_ATOMIC); skb = alloc_skb(sizeoftlvs, GFP_ATOMIC);
if (skb == NULL) if (skb == NULL)
@ -1409,12 +1407,10 @@ static void lane2_associate_ind(struct net_device *dev, u8 *mac_addr,
kfree(entry->tlvs); kfree(entry->tlvs);
entry->tlvs = kmalloc(sizeoftlvs, GFP_KERNEL); entry->tlvs = kmemdup(tlvs, sizeoftlvs, GFP_KERNEL);
if (entry->tlvs == NULL) if (entry->tlvs == NULL)
return; return;
entry->sizeoftlvs = sizeoftlvs; entry->sizeoftlvs = sizeoftlvs;
memcpy(entry->tlvs, tlvs, sizeoftlvs);
#endif #endif
#if 0 #if 0
printk("lec.c: lane2_associate_ind()\n"); printk("lec.c: lane2_associate_ind()\n");

3
net/atm/mpc.c
View File

@ -1322,13 +1322,12 @@ static void set_mps_mac_addr_rcvd(struct k_message *msg, struct mpoa_client *cli
if(client->number_of_mps_macs) if(client->number_of_mps_macs)
kfree(client->mps_macs); kfree(client->mps_macs);
client->number_of_mps_macs = 0; 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) { if (client->mps_macs == NULL) {
printk("mpoa: set_mps_mac_addr_rcvd: out of memory\n"); printk("mpoa: set_mps_mac_addr_rcvd: out of memory\n");
return; return;
} }
client->number_of_mps_macs = 1; client->number_of_mps_macs = 1;
memcpy(client->mps_macs, msg->MPS_ctrl, ETH_ALEN);
return; return;
} }

6
net/atm/mpoa_caches.c
View File

@ -87,7 +87,7 @@ static in_cache_entry *in_cache_get_by_vcc(struct atm_vcc *vcc,
static in_cache_entry *in_cache_add_entry(__be32 dst_ip, static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
struct mpoa_client *client) 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) { if (entry == NULL) {
printk("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n"); printk("mpoa: mpoa_caches.c: new_in_cache_entry: out of memory\n");
@ -95,7 +95,6 @@ static in_cache_entry *in_cache_add_entry(__be32 dst_ip,
} }
dprintk("mpoa: mpoa_caches.c: adding an ingress entry, ip = %u.%u.%u.%u\n", NIPQUAD(dst_ip)); 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); atomic_set(&entry->use, 1);
dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n"); dprintk("mpoa: mpoa_caches.c: new_in_cache_entry: about to lock\n");
@ -447,7 +446,7 @@ static void eg_cache_remove_entry(eg_cache_entry *entry,
static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_client *client) static 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) { if (entry == NULL) {
printk("mpoa: mpoa_caches.c: new_eg_cache_entry: out of memory\n"); printk("mpoa: mpoa_caches.c: new_eg_cache_entry: out of memory\n");
@ -455,7 +454,6 @@ static eg_cache_entry *eg_cache_add_entry(struct k_message *msg, struct mpoa_cli
} }
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)); 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); atomic_set(&entry->use, 1);
dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: about to lock\n"); dprintk("mpoa: mpoa_caches.c: new_eg_cache_entry: about to lock\n");