commit 52f1cfc2fa07ffb49f8ff88c0adf91ec2a8dcdeb
author Bram Bonné <brambonne@google.com> Thu Jul 08 11:01:41 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 08 11:01:41 2021 +0000
tree c6099cccc7af9fd718a4a03d2963141aa4473b85
parent cbc3cca35f11619261ac243e15d3a07ff86687e0
parent bc91e46ad015418f591eb901223107deac61472c

Merge "libsepol: trigger new RTM_GETNEIGH{TBL} behavior"

libsepol/include/sepol/policydb/policydb.h

diff --git a/libsepol/include/sepol/policydb/policydb.h b/libsepol/include/sepol/policydb/policydb.h
index 36e5137..3c35687 100644
--- a/libsepol/include/sepol/policydb/policydb.h
+++ b/libsepol/include/sepol/policydb/policydb.h
@@ -791,7 +791,8 @@
 
 #define POLICYDB_CONFIG_UNKNOWN_MASK	(DENY_UNKNOWN | REJECT_UNKNOWN | ALLOW_UNKNOWN)
 
-#define POLICYDB_CONFIG_ANDROID_NETLINK_ROUTE  1 << 31;
+#define POLICYDB_CONFIG_ANDROID_NETLINK_ROUTE  (1 << 31)
+#define POLICYDB_CONFIG_ANDROID_NETLINK_GETNEIGH (1 << 30)
 
 #define OBJECT_R "object_r"
 #define OBJECT_R_VAL 1

libsepol/src/write.c

diff --git a/libsepol/src/write.c b/libsepol/src/write.c
index 65aba32..cffd75e 100644
--- a/libsepol/src/write.c
+++ b/libsepol/src/write.c
@@ -2138,6 +2138,7 @@
 	config |= (POLICYDB_CONFIG_UNKNOWN_MASK & p->handle_unknown);
 
 	config |= POLICYDB_CONFIG_ANDROID_NETLINK_ROUTE;
+	config |= POLICYDB_CONFIG_ANDROID_NETLINK_GETNEIGH;
 
 	/* Write the magic number and string identifiers. */
 	items = 0;