2012-04-17 17:12:15 +00:00
|
|
|
diff --git a/libsepol/include/sepol/policydb/polcaps.h b/libsepol/include/sepol/policydb/polcaps.h
|
|
|
|
index 40c0a48..0ac2a1d 100644
|
|
|
|
--- a/libsepol/include/sepol/policydb/polcaps.h
|
|
|
|
+++ b/libsepol/include/sepol/policydb/polcaps.h
|
|
|
|
@@ -5,6 +5,7 @@
|
|
|
|
enum {
|
|
|
|
POLICYDB_CAPABILITY_NETPEER,
|
|
|
|
POLICYDB_CAPABILITY_OPENPERM,
|
|
|
|
+ POLICYDB_CAPABILITY_PTRACE_CHILD,
|
|
|
|
__POLICYDB_CAPABILITY_MAX
|
|
|
|
};
|
|
|
|
#define POLICYDB_CAPABILITY_MAX (__POLICYDB_CAPABILITY_MAX - 1)
|
|
|
|
diff --git a/libsepol/src/polcaps.c b/libsepol/src/polcaps.c
|
|
|
|
index 71970b1..e003bc7 100644
|
|
|
|
--- a/libsepol/src/polcaps.c
|
|
|
|
+++ b/libsepol/src/polcaps.c
|
|
|
|
@@ -8,6 +8,7 @@
|
|
|
|
static const char *polcap_names[] = {
|
|
|
|
"network_peer_controls", /* POLICYDB_CAPABILITY_NETPEER */
|
|
|
|
"open_perms", /* POLICYDB_CAPABILITY_OPENPERM */
|
|
|
|
+ "ptrace_child", /* POLICYDB_CAPABILITY_PTRACE_CHILD */
|
|
|
|
NULL
|
2011-12-15 21:18:28 +00:00
|
|
|
};
|
2011-12-15 20:05:59 +00:00
|
|
|
|
2012-04-23 22:20:41 +00:00
|
|
|
diff --git a/libsepol/src/policydb.c b/libsepol/src/policydb.c
|
|
|
|
index a84de2f..ff292f6 100644
|
|
|
|
--- a/libsepol/src/policydb.c
|
|
|
|
+++ b/libsepol/src/policydb.c
|
|
|
|
@@ -2380,7 +2380,7 @@ int filename_trans_read(filename_trans_t **t, struct policy_file *fp)
|
|
|
|
return -1;
|
|
|
|
len = le32_to_cpu(buf[0]);
|
|
|
|
|
|
|
|
- name = calloc(len, sizeof(*name));
|
|
|
|
+ name = calloc(len + 1, sizeof(*name));
|
|
|
|
if (!name)
|
|
|
|
return -1;
|
|
|
|
|