git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
net
/
irda
/
irias_object.c
diff --git
a/net/irda/irias_object.c
b/net/irda/irias_object.c
index
a154b1d
..
b1ee99a
100644
(file)
--- a/
net/irda/irias_object.c
+++ b/
net/irda/irias_object.c
@@
-43,7
+43,7
@@
struct ias_value irias_missing = { IAS_MISSING, 0, 0, 0, {0}};
*
* Faster, check boundary... Jean II
*/
*
* Faster, check boundary... Jean II
*/
-static char *strndup(char *str,
in
t max)
+static char *strndup(char *str,
size_
t max)
{
char *new_str;
int len;
{
char *new_str;
int len;
@@
-501,13
+501,12
@@
struct ias_value *irias_new_octseq_value(__u8 *octseq , int len)
len = IAS_MAX_OCTET_STRING;
value->len = len;
len = IAS_MAX_OCTET_STRING;
value->len = len;
- value->t.oct_seq = km
alloc(
len, GFP_ATOMIC);
+ value->t.oct_seq = km
emdup(octseq,
len, GFP_ATOMIC);
if (value->t.oct_seq == NULL){
IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);
kfree(value);
return NULL;
}
if (value->t.oct_seq == NULL){
IRDA_WARNING("%s: Unable to kmalloc!\n", __FUNCTION__);
kfree(value);
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;
}