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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
security
/
selinux
/
ss
/
ebitmap.c
diff --git
a/security/selinux/ss/ebitmap.c
b/security/selinux/ss/ebitmap.c
index
d8ce9cc
..
47024a6
100644
(file)
--- a/
security/selinux/ss/ebitmap.c
+++ b/
security/selinux/ss/ebitmap.c
@@
-39,12
+39,11
@@
int ebitmap_cpy(struct ebitmap *dst, struct ebitmap *src)
n = src->node;
prev = NULL;
while (n) {
n = src->node;
prev = NULL;
while (n) {
- new = k
m
alloc(sizeof(*new), GFP_ATOMIC);
+ new = k
z
alloc(sizeof(*new), GFP_ATOMIC);
if (!new) {
ebitmap_destroy(dst);
return -ENOMEM;
}
if (!new) {
ebitmap_destroy(dst);
return -ENOMEM;
}
- memset(new, 0, sizeof(*new));
new->startbit = n->startbit;
new->map = n->map;
new->next = NULL;
new->startbit = n->startbit;
new->map = n->map;
new->next = NULL;
@@
-150,10
+149,9
@@
int ebitmap_set_bit(struct ebitmap *e, unsigned long bit, int value)
if (!value)
return 0;
if (!value)
return 0;
- new = k
m
alloc(sizeof(*new), GFP_ATOMIC);
+ new = k
z
alloc(sizeof(*new), GFP_ATOMIC);
if (!new)
return -ENOMEM;
if (!new)
return -ENOMEM;
- memset(new, 0, sizeof(*new));
new->startbit = bit & ~(MAPSIZE - 1);
new->map = (MAPBIT << (bit - new->startbit));
new->startbit = bit & ~(MAPSIZE - 1);
new->map = (MAPBIT << (bit - new->startbit));
@@
-196,8
+194,9
@@
int ebitmap_read(struct ebitmap *e, void *fp)
{
int rc;
struct ebitmap_node *n, *l;
{
int rc;
struct ebitmap_node *n, *l;
- u32 buf[3], mapsize, count, i;
- u64 map;
+ __le32 buf[3];
+ u32 mapsize, count, i;
+ __le64 map;
ebitmap_init(e);
ebitmap_init(e);
@@
-231,13
+230,12
@@
int ebitmap_read(struct ebitmap *e, void *fp)
printk(KERN_ERR "security: ebitmap: truncated map\n");
goto bad;
}
printk(KERN_ERR "security: ebitmap: truncated map\n");
goto bad;
}
- n = k
m
alloc(sizeof(*n), GFP_KERNEL);
+ n = k
z
alloc(sizeof(*n), GFP_KERNEL);
if (!n) {
printk(KERN_ERR "security: ebitmap: out of memory\n");
rc = -ENOMEM;
goto bad;
}
if (!n) {
printk(KERN_ERR "security: ebitmap: out of memory\n");
rc = -ENOMEM;
goto bad;
}
- memset(n, 0, sizeof(*n));
n->startbit = le32_to_cpu(buf[0]);
n->startbit = le32_to_cpu(buf[0]);