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
vserver 1.9.5.x5
[linux-2.6.git]
/
security
/
selinux
/
ss
/
policydb.h
diff --git
a/security/selinux/ss/policydb.h
b/security/selinux/ss/policydb.h
index
31321c1
..
e660e85
100644
(file)
--- a/
security/selinux/ss/policydb.h
+++ b/
security/selinux/ss/policydb.h
@@
-246,6
+246,8
@@
struct policydb {
struct ebitmap trustedwriters;
struct ebitmap trustedobjects;
#endif
struct ebitmap trustedwriters;
struct ebitmap trustedobjects;
#endif
+
+ unsigned int policyvers;
};
extern int policydb_init(struct policydb *p);
};
extern int policydb_init(struct policydb *p);
@@
-271,17
+273,15
@@
struct policy_file {
size_t len;
};
size_t len;
};
-static inline
void *next_entry(
struct policy_file *fp, size_t bytes)
+static inline
int next_entry(void *buf,
struct policy_file *fp, size_t bytes)
{
{
- void *buf;
-
if (bytes > fp->len)
if (bytes > fp->len)
- return
NUL
L;
+ return
-EINVA
L;
-
buf = fp->data
;
+
memcpy(buf, fp->data, bytes)
;
fp->data += bytes;
fp->len -= bytes;
fp->data += bytes;
fp->len -= bytes;
- return
buf
;
+ return
0
;
}
#endif /* _SS_POLICYDB_H_ */
}
#endif /* _SS_POLICYDB_H_ */