diff options
| author |   Huw Davies <huw@codeweavers.com> | 2016-06-27 15:02:46 -0400 |
|---|---|---|
| committer |   Paul Moore <paul@paul-moore.com> | 2016-06-27 15:02:46 -0400 |
| commit | 8f18e675c3335b5f113dbabc4afbab6da41ff61f (patch) | |
| tree | 36a4292c1676752e7a2bf57b4a993b3f447a55ae /net/netlabel/netlabel_unlabeled.c | |
| parent | netlabel: Mark rcu pointers with __rcu. (diff) | |
| download | linux-dev-8f18e675c3335b5f113dbabc4afbab6da41ff61f.tar.xz linux-dev-8f18e675c3335b5f113dbabc4afbab6da41ff61f.zip | |
netlabel: Add an address family to domain hash entries.
The reason is to allow different labelling protocols for
different address families with the same domain.
This requires the addition of an address family attribute
in the netlink communication protocol. It is used in several
messages:
NLBL_MGMT_C_ADD and NLBL_MGMT_C_ADDDEF take it as an optional
attribute for the unlabelled protocol. It may be one of AF_INET,
AF_INET6 or AF_UNSPEC (to specify both address families). If it
is missing, it defaults to AF_UNSPEC.
NLBL_MGMT_C_LISTALL and NLBL_MGMT_C_LISTDEF return it as part of
the enumeration of each item. Addtionally, it may be sent to
LISTDEF to specify which address family to return.
Signed-off-by: Huw Davies <huw@codeweavers.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
Diffstat (limited to 'net/netlabel/netlabel_unlabeled.c')
| -rw-r--r-- | net/netlabel/netlabel_unlabeled.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/net/netlabel/netlabel_unlabeled.c b/net/netlabel/netlabel_unlabeled.c index ca590d2a01b0..4528cff9138b 100644 --- a/net/netlabel/netlabel_unlabeled.c +++ b/net/netlabel/netlabel_unlabeled.c @@ -1537,6 +1537,7 @@ int __init netlbl_unlabel_defconf(void) entry = kzalloc(sizeof(*entry), GFP_KERNEL); if (entry == NULL) return -ENOMEM; + entry->family = AF_UNSPEC; entry->def.type = NETLBL_NLTYPE_UNLABELED; ret_val = netlbl_domhsh_add_default(entry, &audit_info); if (ret_val != 0) |