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
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
s390
/
char
/
monreader.c
diff --git
a/drivers/s390/char/monreader.c
b/drivers/s390/char/monreader.c
index
fb7bc9e
..
5fd3ad8
100644
(file)
--- a/
drivers/s390/char/monreader.c
+++ b/
drivers/s390/char/monreader.c
@@
-257,13
+257,14
@@
mon_alloc_mem(void)
int i,j;
struct mon_private *monpriv;
int i,j;
struct mon_private *monpriv;
- monpriv = k
z
alloc(sizeof(struct mon_private), GFP_KERNEL);
+ monpriv = k
m
alloc(sizeof(struct mon_private), GFP_KERNEL);
if (!monpriv) {
P_ERROR("no memory for monpriv\n");
return NULL;
}
if (!monpriv) {
P_ERROR("no memory for monpriv\n");
return NULL;
}
+ memset(monpriv, 0, sizeof(struct mon_private));
for (i = 0; i < MON_MSGLIM; i++) {
for (i = 0; i < MON_MSGLIM; i++) {
- monpriv->msg_array[i] = k
z
alloc(sizeof(struct mon_msg),
+ monpriv->msg_array[i] = k
m
alloc(sizeof(struct mon_msg),
GFP_KERNEL);
if (!monpriv->msg_array[i]) {
P_ERROR("open, no memory for msg_array\n");
GFP_KERNEL);
if (!monpriv->msg_array[i]) {
P_ERROR("open, no memory for msg_array\n");
@@
-271,6
+272,7
@@
mon_alloc_mem(void)
kfree(monpriv->msg_array[j]);
return NULL;
}
kfree(monpriv->msg_array[j]);
return NULL;
}
+ memset(monpriv->msg_array[i], 0, sizeof(struct mon_msg));
}
return monpriv;
}
}
return monpriv;
}