lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IRDA]: Use kmemdup 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:18:33 -02:00
committed by David S. Miller
parent 8b2ed4bba4
commit b3ab09f9e1
4 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/irda/iriap.c
View File

@@ -172,7 +172,7 @@ struct iriap_cb *iriap_open(__u8 slsap_sel, int mode, void *priv,
IRDA_DEBUG(2, "%s()\n", __FUNCTION__); IRDA_DEBUG(2, "%s()\n", __FUNCTION__);
self = kmalloc(sizeof(struct iriap_cb), GFP_ATOMIC); self = kzalloc(sizeof(*self), GFP_ATOMIC);
if (!self) { if (!self) {
IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__); IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);
return NULL; return NULL;
@@ -181,7 +181,6 @@ struct iriap_cb *iriap_open(__u8 slsap_sel, int mode, void *priv,
/* /*
* Initialize instance * Initialize instance
*/ */
memset(self, 0, sizeof(struct iriap_cb));
self->magic = IAS_MAGIC; self->magic = IAS_MAGIC;
self->mode = mode; self->mode = mode;

4
net/irda/irias_object.c
View File

@@ -501,13 +501,12 @@ struct ias_value *irias_new_octseq_value(__u8 *octseq , int len)
len = IAS_MAX_OCTET_STRING; len = IAS_MAX_OCTET_STRING;
value->len = len; value->len = len;
value->t.oct_seq = kmalloc(len, GFP_ATOMIC); value->t.oct_seq = kmemdup(octseq, len, GFP_ATOMIC);
if (value->t.oct_seq == NULL){ if (value->t.oct_seq == NULL){
IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__); IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);
kfree(value); kfree(value);
return NULL; return NULL;
} }
memcpy(value->t.oct_seq, octseq , len);
return value; return value;
} }
@@ -522,7 +521,6 @@ struct ias_value *irias_new_missing_value(void)
} }
value->type = IAS_MISSING; value->type = IAS_MISSING;
value->len = 0;
return value; return value;
} }

4
net/irda/irlmp.c
View File

@@ -641,15 +641,13 @@ struct lsap_cb *irlmp_dup(struct lsap_cb *orig, void *instance)
} }
/* Allocate a new instance */ /* Allocate a new instance */
new = kmalloc(sizeof(struct lsap_cb), GFP_ATOMIC); new = kmemdup(orig, sizeof(*new), GFP_ATOMIC);
if (!new) { if (!new) {
IRDA_DEBUG(0, "%s(), unable to kmalloc\n", __FUNCTION__); IRDA_DEBUG(0, "%s(), unable to kmalloc\n", __FUNCTION__);
spin_unlock_irqrestore(&irlmp->unconnected_lsaps->hb_spinlock, spin_unlock_irqrestore(&irlmp->unconnected_lsaps->hb_spinlock,
flags); flags);
return NULL; return NULL;
} }
/* Dup */
memcpy(new, orig, sizeof(struct lsap_cb));
/* new->lap = orig->lap; => done in the memcpy() */ /* new->lap = orig->lap; => done in the memcpy() */
/* new->slsap_sel = orig->slsap_sel; => done in the memcpy() */ /* new->slsap_sel = orig->slsap_sel; => done in the memcpy() */
new->conn_skb = NULL; new->conn_skb = NULL;

3
net/irda/irqueue.c
View File

@@ -356,14 +356,13 @@ hashbin_t *hashbin_new(int type)
/* /*
* Allocate new hashbin * Allocate new hashbin
*/ */
hashbin = kmalloc( sizeof(hashbin_t), GFP_ATOMIC); hashbin = kzalloc(sizeof(*hashbin), GFP_ATOMIC);
if (!hashbin) if (!hashbin)
return NULL; return NULL;
/* /*
* Initialize structure * Initialize structure
*/ */
memset(hashbin, 0, sizeof(hashbin_t));
hashbin->hb_type = type; hashbin->hb_type = type;
hashbin->magic = HB_MAGIC; hashbin->magic = HB_MAGIC;
//hashbin->hb_current = NULL; //hashbin->hb_current = NULL;