Updated patchset with Thomas' comments
v2 cover Updated patchset with Thomas' comments
This is an updated patchset which takes into account Thomas' comments. This includes the addition of two new patches in the patchset which add a new Netlink interface as well as correct the list of interfaces in the large comment block at the top of include/net/netlink.h.
Please consider these patches for 2.6.19, thanks.
--
paul moore
linux security @ hp
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
PATCH v2 1/8 NetLabel: correct improper handling of non-NetLabel peer contexts
Fix a problem where NetLabel would always set the value of sk_security_struct->peer_sid in selinux_netlbl_sock_graft() to the context of the socket, causing problems when users would query the context of the connection. This patch fixes this so that the value in sk_security_struct->peer_sid is only set when the connection is NetLabel based, otherwise the value is untouched.
--- include/net/cipso_ipv4.h | 7 +++++ include/net/netlabel.h | 8 ++++++ net/ipv4/cipso_ipv4.c | 48 ++++++++++++++++++++++++++++------------- net/netlabel/netlabel_kapi.c | 23 +++++++++++++++++++ security/selinux/ss/services.c | 12 +++++++++- 5 files changed, 82 insertions(+), 16 deletions(-)
include/net/cipso_ipv4.h +7 -0
@@ -205,6 +205,7 @@ void cipso_v4_error(struct sk_buff *skb,int cipso_v4_socket_setattr (const struct socket *sock,const struct cipso_v4_doi *doi_def,const struct netlbl_lsm_secattr *secattr); +int cipso_v4_sock_getattr (struct sock *sk,struct netlbl_lsm_secattr *secattr);int cipso_v4_socket_getattr (const struct socket *sock,struct netlbl_lsm_secattr *secattr); int cipso_v4_skbuff_getattr(const struct sk_buff *skb,
@@ -225,6 +226,12 @@ static inline int cipso_v4_socket_setattreturn -ENOSYS ; } +static inline int cipso_v4_sock_getattr (struct sock *sk, +struct netlbl_lsm_secattr *secattr) +{ +return -ENOSYS ; +} +static inline int cipso_v4_socket_getattr (const struct socket *sock,struct netlbl_lsm_secattr *secattr) {
include/net/netlabel.h +8 -0
@@ -238,6 +238,8 @@ static inline void netlbl_secattr_free(s#ifdef CONFIG_NETLABEL int netlbl_socket_setattr (const struct socket *sock,const struct netlbl_lsm_secattr *secattr); +int netlbl_sock_getattr (struct sock *sk, +struct netlbl_lsm_secattr *secattr);int netlbl_socket_getattr (const struct socket *sock,struct netlbl_lsm_secattr *secattr); int netlbl_skbuff_getattr(const struct sk_buff *skb,
@@ -250,6 +252,12 @@ static inline int netlbl_socket_setattr(return -ENOSYS ; } +static inline int netlbl_sock_getattr (struct sock *sk, +struct netlbl_lsm_secattr *secattr) +{ +return -ENOSYS ; +} +static inline int netlbl_socket_getattr (const struct socket *sock,struct netlbl_lsm_secattr *secattr) {
net/ipv4/cipso_ipv4.c +33 -15
84 lines not on this page · raw message
net/netlabel/netlabel_kapi.c +23 -0
@@ -85,6 +85,29 @@ socket_setattr_return: }/** +* netlbl_sock_getattr - Determine the security attributes of a sock +* @sk: the sock +* @secattr: the security attributes +* +* Description: +* Examines the given sock to see any NetLabel style labeling has been +* applied to the sock, if so it parses the socket label and returns the +* security attributes in @secattr. Returns zero on success, negative values +* on failure. +* +*/ +int netlbl_sock_getattr (struct sock *sk,struct netlbl_lsm_secattr *secattr) +{ +int ret_val; + + ret_val =cipso_v4_sock_getattr (sk, secattr); +if (ret_val ==0 ) +return 0 ; + +return netlbl_unlabel_getattr (secattr); +} + +/** * netlbl_socket_getattr - Determine the security attributes of a socket * @sock: the socket * @secattr: the security attributes
security/selinux/ss/services.c +11 -1
@@ -2502,14 +2502,24 @@ void selinux_netlbl_sock_graft(struct so {struct inode_security_struct *isec =SOCK_INODE (sock)->i_security;struct sk_security_struct *sksec = sk->sk_security; +struct netlbl_lsm_secattr secattr; +u32 nlbl_peer_sid; sksec->sclass = isec->sclass;if (sk->sk_family !=PF_INET )return ; +netlbl_secattr_init (&secattr); +if (netlbl_sock_getattr (sk, &secattr) ==0 && +selinux_netlbl_secattr_to_sid (NULL , + &secattr, + sksec->sid, + &nlbl_peer_sid) ==0 ) + sksec->peer_sid = nlbl_peer_sid; +netlbl_secattr_destroy (&secattr,0 ); + sksec->nlbl_state =NLBL_REQUIRE ; - sksec->peer_sid = sksec->sid;/* Try to set the NetLabel on the socket to save time later, if we fail * here we will pick up the pieces in later calls to
--
paul moore
linux security @ hp
PATCH v2 2/8 NetLabel: make the CIPSOv4 cache spinlocks bottom half safe
In reply to [email protected]The CIPSOv4 cache traversal routines are triggered both the userspace events (cache invalidation due to DOI removal or updated SELinux policy) and network packet processing events. As a result there is a problem with the existing CIPSOv4 cache spinlocks as they are not bottom-half/softirq safe. This patch converts the CIPSOv4 cache spin_[un]lock() calls into spin_[un]lock_bh() calls to address this problem.
--- net/ipv4/cipso_ipv4.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-)
net/ipv4/cipso_ipv4.c +8 -8
@@ -259,7 +259,7 @@ void cipso_v4_cache_invalidate(void)u32 iter;for (iter =0 ; iter <CIPSO_V4_CACHE_BUCKETS ; iter++) { -spin_lock (&cipso_v4_cache[iter].lock); +spin_lock_bh (&cipso_v4_cache[iter].lock);list_for_each_entry_safe (entry, tmp_entry, &cipso_v4_cache[iter].list, list) {
@@ -267,7 +267,7 @@ void cipso_v4_cache_invalidate(void)cipso_v4_cache_entry_free (entry); } cipso_v4_cache[iter].size =0 ; -spin_unlock (&cipso_v4_cache[iter].lock); +spin_unlock_bh (&cipso_v4_cache[iter].lock); }return ;
@@ -309,7 +309,7 @@ static int cipso_v4_cache_check(const un hash =cipso_v4_map_cache_hash (key, key_len); bkt = hash & (CIPSO_V4_CACHE_BUCKETBITS -1 ); -spin_lock (&cipso_v4_cache[bkt].lock); +spin_lock_bh (&cipso_v4_cache[bkt].lock);list_for_each_entry (entry, &cipso_v4_cache[bkt].list, list) { if (entry->hash == hash && entry->key_len == key_len &&
@@ -318,7 +318,7 @@ static int cipso_v4_cache_check(const un secattr->cache.free = entry->lsm_data.free; secattr->cache.data = entry->lsm_data.data;if (prev_entry ==NULL ) { -spin_unlock (&cipso_v4_cache[bkt].lock); +spin_unlock_bh (&cipso_v4_cache[bkt].lock);return 0 ; }
@@ -333,12 +333,12 @@ static int cipso_v4_cache_check(const un &prev_entry->list); } -spin_unlock (&cipso_v4_cache[bkt].lock); +spin_unlock_bh (&cipso_v4_cache[bkt].lock);return 0 ; } prev_entry = entry; } -spin_unlock (&cipso_v4_cache[bkt].lock); +spin_unlock_bh (&cipso_v4_cache[bkt].lock);return -ENOENT ; }
@@ -387,7 +387,7 @@ int cipso_v4_cache_add(const struct sk_b entry->lsm_data.data = secattr->cache.data; bkt = entry->hash & (CIPSO_V4_CACHE_BUCKETBITS -1 ); -spin_lock (&cipso_v4_cache[bkt].lock); +spin_lock_bh (&cipso_v4_cache[bkt].lock);if (cipso_v4_cache[bkt].size < cipso_v4_cache_bucketsize) {list_add (&entry->list, &cipso_v4_cache[bkt].list); cipso_v4_cache[bkt].size +=1 ;
@@ -398,7 +398,7 @@ int cipso_v4_cache_add(const struct sk_blist_add (&entry->list, &cipso_v4_cache[bkt].list);cipso_v4_cache_entry_free (old_entry); } -spin_unlock (&cipso_v4_cache[bkt].lock); +spin_unlock_bh (&cipso_v4_cache[bkt].lock);return 0 ;
--
paul moore
linux security @ hp
PATCH v2 3/8 NetLabel: change the SELinux permissions
In reply to [email protected]Change NetLabel to use the 'recvfrom' socket permission and the SECINITSID_NETMSG SELinux SID as the NetLabel base SID for incoming packets. This patch effectively makes the old, and currently unused, SELinux NETMSG permissions NetLabel permissions.
--- security/selinux/ss/services.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
security/selinux/ss/services.c +4 -4
@@ -2611,7 +2611,7 @@ int selinux_netlbl_sock_rcv_skb(struct su32 netlbl_sid;u32 recv_perm; - rc =selinux_netlbl_skbuff_getsid (skb, sksec->sid, &netlbl_sid); + rc =selinux_netlbl_skbuff_getsid (skb,SECINITSID_NETMSG , &netlbl_sid);if (rc !=0 )return rc;
@@ -2620,13 +2620,13 @@ int selinux_netlbl_sock_rcv_skb(struct sswitch (sksec->sclass) {case SECCLASS_UDP_SOCKET : - recv_perm =UDP_SOCKET__RECV_MSG ; + recv_perm =UDP_SOCKET__RECVFROM ;break ;case SECCLASS_TCP_SOCKET : - recv_perm =TCP_SOCKET__RECV_MSG ; + recv_perm =TCP_SOCKET__RECVFROM ;break ;default : - recv_perm =RAWIP_SOCKET__RECV_MSG ; + recv_perm =RAWIP_SOCKET__RECVFROM ; } rc = avc_has_perm(sksec->sid,
--
paul moore
linux security @ hp
PATCH v2 4/8 Netlink: add nla_for_each_nested() to the interface list
In reply to [email protected]At the top of include/net/netlink.h is a list of Netlink interfaces, however, the nla_for_each_nested() macro was not listed. This patch adds this interface to the list at the top of the header file.
--- include/net/netlink.h | 1 + 1 files changed, 1 insertion(+)
include/net/netlink.h +1 -0
@@ -151,6 +151,7 @@* nla_parse() parse and validate stream of attrs * nla_parse_nested() parse nested attribuets * nla_for_each_attr() loop over all attributes +* nla_for_each_nested() loop over the nested attributes *========================================================================= */
--
paul moore
linux security @ hp
PATCH v2 5/8 Netlink: add nla_validate_nested()
In reply to [email protected]Add a new function, nla_validate_nested(), to validate nested Netlink attributes.
--- include/net/netlink.h | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+)
include/net/netlink.h +19 -0
@@ -146,6 +146,7 @@* nla_ok(nla, remaining) does nla fit into remaining bytes? * nla_next(nla, remaining) get next netlink attribute * nla_validate() validate a stream of attributes +* nla_validate_nested() validate a stream of nested attributes * nla_find() find attribute in stream of attributes * nla_find_nested() find attribute in nested attributes * nla_parse() parse and validate stream of attrs
@@ -951,6 +952,24 @@ static inline int nla_nest_cancel(struct }/** +* nla_validate_nested - Validate a stream of nested attributes +* @start: container attribute +* @maxtype: maximum attribute type to be expected +* @policy: validation policy +* +* Validates all attributes in the nested attribute stream against the +* specified policy. Attributes with a type exceeding maxtype will be +* ignored. See documenation of struct nla_policy for more details. +* +* Returns 0 on success or a negative error code. +*/ +static inline int nla_validate_nested (struct nlattr *start,int maxtype, +struct nla_policy *policy) +{ +return nla_validate (nla_data (start),nla_len (start), maxtype, policy); +} + +/** * nla_for_each_attr - iterate over a stream of attributes * @pos: loop counter, set to current attribute * @head: head of attribute stream
--
paul moore
linux security @ hp
PATCH v2 6/8 NetLabel: rework the Netlink attribute handling (part 1)
In reply to [email protected]At the suggestion of Thomas Graf, rewrite NetLabel's use of Netlink attributes to better follow the common Netlink attribute usage.
--- include/net/cipso_ipv4.h | 16 +- include/net/netlabel.h | 49 -------- net/ipv4/cipso_ipv4.c | 203 ++++--------------------------------- net/netlabel/netlabel_domainhash.c | 183 ++++++--------------------------- net/netlabel/netlabel_domainhash.h | 6 - net/netlabel/netlabel_user.c | 82 -------------- net/netlabel/netlabel_user.h | 141 ------------------------- 7 files changed, 76 insertions(+), 604 deletions(-)
include/net/cipso_ipv4.h +7 -9
@@ -130,8 +130,9 @@ extern int cipso_v4_rbm_strictvalid;int cipso_v4_doi_add (struct cipso_v4_doi *doi_def);int cipso_v4_doi_remove (u32 doi,void (*callback) (struct rcu_head * head));struct cipso_v4_doi *cipso_v4_doi_getdef (u32 doi); -struct sk_buff *cipso_v4_doi_dump_all (size_t headroom); -struct sk_buff *cipso_v4_doi_dump (u32 doi,size_t headroom); +int cipso_v4_doi_walk (u32 *skip_cnt, +int (*callback) (struct cipso_v4_doi *doi_def,void *arg), +void *cb_arg);int cipso_v4_doi_domhsh_add (struct cipso_v4_doi *doi_def,const char *domain);int cipso_v4_doi_domhsh_remove (struct cipso_v4_doi *doi_def,const char *domain);
@@ -152,14 +153,11 @@ static inline struct cipso_v4_doi *cipsoreturn NULL ; } -static inline struct sk_buff *cipso_v4_doi_dump_all (size_t headroom) +static inline int cipso_v4_doi_walk (u32 *skip_cnt, +int (*callback) (struct cipso_v4_doi *doi_def,void *arg), +void *cb_arg) { -return NULL ; -} - -static inline struct sk_buff *cipso_v4_doi_dump (u32 doi,size_t headroom) -{ -return NULL ; +return 0 ; } static inline int cipso_v4_doi_domhsh_add(struct cipso_v4_doi *doi_def,
include/net/netlabel.h +2 -47
61 lines not on this page · raw message
net/ipv4/cipso_ipv4.c +24 -179
221 lines not on this page · raw message
net/netlabel/netlabel_domainhash.c +37 -146
197 lines not on this page · raw message
net/netlabel/netlabel_domainhash.h +4 -2
@@ -61,7 +61,9 @@ int netlbl_domhsh_add(struct netlbl_dom_int netlbl_domhsh_add_default (struct netlbl_dom_map *entry);int netlbl_domhsh_remove_default (void );struct netlbl_dom_map *netlbl_domhsh_getentry (const char *domain); -struct sk_buff *netlbl_domhsh_dump (size_t headroom); -struct sk_buff *netlbl_domhsh_dump_default (size_t headroom); +int netlbl_domhsh_walk (u32 *skip_bkt, +u32 *skip_chain, +int (*callback) (struct netlbl_dom_map *entry,void *arg), +void *cb_arg);#endif
net/netlabel/netlabel_user.c +0 -82
85 lines not on this page · raw message
net/netlabel/netlabel_user.h +2 -139
165 lines not on this page · raw message
--
paul moore
linux security @ hp
PATCH v2 8/8 NetLabel: update docs with website information
In reply to [email protected]Now that all of the supporting pieces of NetLabel have a home at SourceForge update the Kconfig help text and add an entry to the MAINTAINERS file.
--- MAINTAINERS | 7 +++++++ net/netlabel/Kconfig | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-)
MAINTAINERS +7 -0
@@ -2008,6 +2008,13 @@ L: [email protected] L: [email protected] S: Supported +NETLABEL +P: Paul Moore +M: [email protected] +W: http://netlabel.sf.net +L: [email protected] +S: Supported + NETROM NETWORK LAYER P: Ralf Baechle M: [email protected]
net/netlabel/Kconfig +4 -1
@@ -9,6 +9,9 @@ config NETLABEL ---help--- NetLabel provides support for explicit network packet labeling protocols such as CIPSO and RIPSO. For more information see - Documentation/netlabel. + Documentation/netlabel as well as the NetLabel SourceForge project + for configuration tools and additional documentation. + + * http://netlabel.sf.net If you are unsure, say N.
--
paul moore
linux security @ hp
--
This message was distributed to subscribers of the selinux mailing list. If you no longer wish to subscribe, send mail to [email protected] with the words "unsubscribe selinux" without quotes as the message.
PATCH v2 7/8 NetLabel: rework the Netlink attribute handling (part 2)
In reply to [email protected]At the suggestion of Thomas Graf, rewrite NetLabel's use of Netlink attributes to better follow the common Netlink attribute usage.
--- net/netlabel/netlabel_cipso_v4.c | 630 ++++++++++++++++++++++++-------------- net/netlabel/netlabel_cipso_v4.h | 235 +++++--------- net/netlabel/netlabel_mgmt.c | 535 ++++++++++++++++---------------- net/netlabel/netlabel_mgmt.h | 213 ++++-------- net/netlabel/netlabel_unlabeled.c | 79 ++-- net/netlabel/netlabel_unlabeled.h | 41 -- 6 files changed, 899 insertions(+), 834 deletions(-)
net/netlabel/netlabel_cipso_v4.c +414 -216
@@ -41,15 +41,37 @@#include "netlabel_user.h" #include "netlabel_cipso_v4.h" +/* Argument struct for cipso_v4_doi_walk() */ +struct netlbl_cipsov4_doiwalk_arg { +struct netlink_callback *nl_cb; +struct sk_buff *skb; +u32 seq; +}; +/* NetLabel Generic NETLINK CIPSOv4 family */ static struct genl_family netlbl_cipsov4_gnl_family = { .id =GENL_ID_GENERATE , .hdrsize =0 , .name =NETLBL_NLTYPE_CIPSOV4_NAME , .version =NETLBL_PROTO_VERSION , - .maxattr =0 , + .maxattr =NLBL_CIPSOV4_A_MAX , }; +/* NetLabel Netlink attribute policy */ +static struct nla_policy netlbl_cipsov4_genl_policy[NLBL_CIPSOV4_A_MAX +1 ] = { + [NLBL_CIPSOV4_A_DOI ] = { .type =NLA_U32 }, + [NLBL_CIPSOV4_A_MTYPE ] = { .type =NLA_U32 }, + [NLBL_CIPSOV4_A_TAG ] = { .type =NLA_U8 }, + [NLBL_CIPSOV4_A_TAGLST ] = { .type =NLA_NESTED }, + [NLBL_CIPSOV4_A_MLSLVLLOC ] = { .type =NLA_U32 }, + [NLBL_CIPSOV4_A_MLSLVLREM ] = { .type =NLA_U32 }, + [NLBL_CIPSOV4_A_MLSLVL ] = { .type =NLA_NESTED }, + [NLBL_CIPSOV4_A_MLSLVLLST ] = { .type =NLA_NESTED }, + [NLBL_CIPSOV4_A_MLSCATLOC ] = { .type =NLA_U32 }, + [NLBL_CIPSOV4_A_MLSCATREM ] = { .type =NLA_U32 }, + [NLBL_CIPSOV4_A_MLSCAT ] = { .type =NLA_NESTED }, + [NLBL_CIPSOV4_A_MLSCATLST ] = { .type =NLA_NESTED }, +};/* * Helper Functions
@@ -81,6 +103,41 @@ static void netlbl_cipsov4_doi_free(strukfree (ptr); } +/** +* netlbl_cipsov4_add_common - Parse the common sections of a ADD message +* @info: the Generic NETLINK info block +* @doi_def: the CIPSO V4 DOI definition +* +* Description: +* Parse the common sections of a ADD message and fill in the related values +* in @doi_def. Returns zero on success, negative values on failure. +* +*/ +static int netlbl_cipsov4_add_common (struct genl_info *info, +struct cipso_v4_doi *doi_def) +{ +struct nlattr *nla; +int nla_rem; +u32 iter =0 ; + + doi_def->doi =nla_get_u32 (info->attrs[NLBL_CIPSOV4_A_DOI ]); + +if (nla_validate_nested (info->attrs[NLBL_CIPSOV4_A_TAGLST ], +NLBL_CIPSOV4_A_MAX , + netlbl_cipsov4_genl_policy) !=0 ) +return -EINVAL ; + +nla_for_each_nested (nla, info->attrs[NLBL_CIPSOV4_A_TAGLST ], nla_rem) +if (nla->nla_type ==NLBL_CIPSOV4_A_TAG ) { +if (iter >CIPSO_V4_TAG_MAXCNT ) +return -EINVAL ; + doi_def->tags[iter++] =nla_get_u8 (nla); + } +if (iter <CIPSO_V4_TAG_MAXCNT ) + doi_def->tags[iter] =CIPSO_V4_TAG_INVALID ; + +return 0 ; +}/* * NetLabel Command Handlers
@@ -88,9 +145,7 @@ static void netlbl_cipsov4_doi_free(stru/** * netlbl_cipsov4_add_std - Adds a CIPSO V4 DOI definition -* @doi: the DOI value -* @msg: the ADD message data -* @msg_size: the size of the ADD message buffer +* @info: the Generic NETLINK info block * * Description: * Create a new CIPSO_V4_MAP_STD DOI definition based on the given ADD message
@@ -98,29 +153,28 @@ static void netlbl_cipsov4_doi_free(stru* error. * */ -static int netlbl_cipsov4_add_std (u32 doi,struct nlattr *msg,size_t msg_size) +static int netlbl_cipsov4_add_std (struct genl_info *info) {int ret_val = -EINVAL ; -int msg_len = msg_size; -u32 num_tags; -u32 num_lvls; -u32 num_cats;struct cipso_v4_doi *doi_def =NULL ; -u32 iter; -u32 tmp_val_a; -u32 tmp_val_b; - -if (msg_len <NETLBL_LEN_U32 ) - goto add_std_failure; - num_tags =netlbl_getinc_u32 (&msg, &msg_len); -if (num_tags ==0 || num_tags >CIPSO_V4_TAG_MAXCNT ) - goto add_std_failure; +struct nlattr *nla_a; +struct nlattr *nla_b; +int nla_a_rem; +int nla_b_rem; + +if (!info->attrs[NLBL_CIPSOV4_A_DOI ] || + !info->attrs[NLBL_CIPSOV4_A_TAGLST ] || + !info->attrs[NLBL_CIPSOV4_A_MLSLVLLST ]) +return -EINVAL ; + +if (nla_validate_nested (info->attrs[NLBL_CIPSOV4_A_MLSLVLLST ], +NLBL_CIPSOV4_A_MAX , + netlbl_cipsov4_genl_policy) !=0 ) +return -EINVAL ; doi_def =kmalloc (sizeof (*doi_def),GFP_KERNEL ); -if (doi_def ==NULL ) { - ret_val = -ENOMEM ; - goto add_std_failure; - } +if (doi_def ==NULL ) +return -ENOMEM ; doi_def->map.std =kzalloc (sizeof (*doi_def->map.std),GFP_KERNEL );if (doi_def->map.std ==NULL ) { ret_val = -ENOMEM ;
@@ -128,28 +182,32 @@ static int netlbl_cipsov4_add_std(u32 do } doi_def->type =CIPSO_V4_MAP_STD ; -for (iter =0 ; iter < num_tags; iter++) { -if (msg_len <NETLBL_LEN_U8 ) - goto add_std_failure; - doi_def->tags[iter] =netlbl_getinc_u8 (&msg, &msg_len); -switch (doi_def->tags[iter]) { -case CIPSO_V4_TAG_RBITMAP : -break ; -default : - goto add_std_failure; - } - } -if (iter <CIPSO_V4_TAG_MAXCNT ) - doi_def->tags[iter] =CIPSO_V4_TAG_INVALID ; - -if (msg_len <6 *NETLBL_LEN_U32 ) + ret_val =netlbl_cipsov4_add_common (info, doi_def); +if (ret_val !=0 ) goto add_std_failure; - num_lvls =netlbl_getinc_u32 (&msg, &msg_len); -if (num_lvls ==0 ) - goto add_std_failure; - doi_def->map.std->lvl.local_size =netlbl_getinc_u32 (&msg, &msg_len); -if (doi_def->map.std->lvl.local_size >CIPSO_V4_MAX_LOC_LVLS ) +nla_for_each_nested (nla_a, + info->attrs[NLBL_CIPSOV4_A_MLSLVLLST ], + nla_a_rem) +if (nla_a->nla_type ==NLBL_CIPSOV4_A_MLSLVL ) { +nla_for_each_nested (nla_b, nla_a, nla_b_rem) +switch (nla_b->nla_type) { +case NLBL_CIPSOV4_A_MLSLVLLOC : +if (nla_get_u32 (nla_b) >= + doi_def->map.std->lvl.local_size) + doi_def->map.std->lvl.local_size = +nla_get_u32 (nla_b) +1 ; +break ; +case NLBL_CIPSOV4_A_MLSLVLREM : +if (nla_get_u32 (nla_b) >= + doi_def->map.std->lvl.cipso_size) + doi_def->map.std->lvl.cipso_size = +nla_get_u32 (nla_b) +1 ; +break ; + } + } +if (doi_def->map.std->lvl.local_size >CIPSO_V4_MAX_LOC_LVLS || + doi_def->map.std->lvl.cipso_size >CIPSO_V4_MAX_REM_LVLS ) goto add_std_failure; doi_def->map.std->lvl.local = kcalloc(doi_def->map.std->lvl.local_size, sizeof(u32),
@@ -158,9 +216,6 @@ static int netlbl_cipsov4_add_std(u32 do ret_val = -ENOMEM ; goto add_std_failure; } - doi_def->map.std->lvl.cipso_size =netlbl_getinc_u8 (&msg, &msg_len); -if (doi_def->map.std->lvl.cipso_size >CIPSO_V4_MAX_REM_LVLS ) - goto add_std_failure; doi_def->map.std->lvl.cipso =kcalloc (doi_def->map.std->lvl.cipso_size,sizeof (u32),GFP_KERNEL );
@@ -168,68 +223,101 @@ static int netlbl_cipsov4_add_std(u32 do ret_val = -ENOMEM ; goto add_std_failure; } +nla_for_each_nested (nla_a, + info->attrs[NLBL_CIPSOV4_A_MLSLVLLST ], + nla_a_rem) +if (nla_a->nla_type ==NLBL_CIPSOV4_A_MLSLVL ) { +struct nlattr *lvl_loc; +struct nlattr *lvl_rem; + +if (nla_validate_nested (nla_a, +NLBL_CIPSOV4_A_MAX , + netlbl_cipsov4_genl_policy) !=0 ) + goto add_std_failure; + + lvl_loc =nla_find_nested (nla_a, +NLBL_CIPSOV4_A_MLSLVLLOC ); + lvl_rem =nla_find_nested (nla_a, +NLBL_CIPSOV4_A_MLSLVLREM ); +if (lvl_loc ==NULL || lvl_rem ==NULL ) + goto add_std_failure; + doi_def->map.std->lvl.local[nla_get_u32 (lvl_loc)] = +nla_get_u32 (lvl_rem); + doi_def->map.std->lvl.cipso[nla_get_u32 (lvl_rem)] = +nla_get_u32 (lvl_loc); + } - num_cats =netlbl_getinc_u32 (&msg, &msg_len); - doi_def->map.std->cat.local_size =netlbl_getinc_u32 (&msg, &msg_len); -if (doi_def->map.std->cat.local_size >CIPSO_V4_MAX_LOC_CATS ) - goto add_std_failure; - doi_def->map.std->cat.local =kcalloc (doi_def->map.std->cat.local_size, +if (info->attrs[NLBL_CIPSOV4_A_MLSCATLST ]) { +if (nla_validate_nested (info->attrs[NLBL_CIPSOV4_A_MLSCATLST ], +NLBL_CIPSOV4_A_MAX , + netlbl_cipsov4_genl_policy) !=0 ) + goto add_std_failure; + +nla_for_each_nested (nla_a, + info->attrs[NLBL_CIPSOV4_A_MLSCATLST ], + nla_a_rem) +if (nla_a->nla_type ==NLBL_CIPSOV4_A_MLSCAT ) { +if (nla_validate_nested (nla_a, +NLBL_CIPSOV4_A_MAX , + netlbl_cipsov4_genl_policy) !=0 ) + goto add_std_failure; +nla_for_each_nested (nla_b, nla_a, nla_b_rem) +switch (nla_b->nla_type) { +case NLBL_CIPSOV4_A_MLSCATLOC : +if (nla_get_u32 (nla_b) >= + doi_def->map.std->cat.local_size) + doi_def->map.std->cat.local_size = +nla_get_u32 (nla_b) +1 ; +break ; +case NLBL_CIPSOV4_A_MLSCATREM : +if (nla_get_u32 (nla_b) >= + doi_def->map.std->cat.cipso_size) + doi_def->map.std->cat.cipso_size = +nla_get_u32 (nla_b) +1 ; +break ; + } + } +if (doi_def->map.std->cat.local_size >CIPSO_V4_MAX_LOC_CATS || + doi_def->map.std->cat.cipso_size >CIPSO_V4_MAX_REM_CATS ) + goto add_std_failure; + doi_def->map.std->cat.local =kcalloc ( + doi_def->map.std->cat.local_size,sizeof (u32),GFP_KERNEL ); -if (doi_def->map.std->cat.local ==NULL ) { - ret_val = -ENOMEM ; - goto add_std_failure; - } - doi_def->map.std->cat.cipso_size =netlbl_getinc_u16 (&msg, &msg_len); -if (doi_def->map.std->cat.cipso_size >CIPSO_V4_MAX_REM_CATS ) - goto add_std_failure; - doi_def->map.std->cat.cipso =kcalloc (doi_def->map.std->cat.cipso_size, +if (doi_def->map.std->cat.local ==NULL ) { + ret_val = -ENOMEM ; + goto add_std_failure; + } + doi_def->map.std->cat.cipso =kcalloc ( + doi_def->map.std->cat.cipso_size,sizeof (u32),GFP_KERNEL ); -if (doi_def->map.std->cat.cipso ==NULL ) { - ret_val = -ENOMEM ; - goto add_std_failure; - } - -if (msg_len < - num_lvls * (NETLBL_LEN_U32 +NETLBL_LEN_U8 ) + - num_cats * (NETLBL_LEN_U32 +NETLBL_LEN_U16 )) - goto add_std_failure; - -for (iter =0 ; iter < doi_def->map.std->lvl.cipso_size; iter++) - doi_def->map.std->lvl.cipso[iter] =CIPSO_V4_INV_LVL ; -for (iter =0 ; iter < doi_def->map.std->lvl.local_size; iter++) - doi_def->map.std->lvl.local[iter] =CIPSO_V4_INV_LVL ; -for (iter =0 ; iter < doi_def->map.std->cat.cipso_size; iter++) - doi_def->map.std->cat.cipso[iter] =CIPSO_V4_INV_CAT ; -for (iter =0 ; iter < doi_def->map.std->cat.local_size; iter++) - doi_def->map.std->cat.local[iter] =CIPSO_V4_INV_CAT ; - -for (iter =0 ; iter < num_lvls; iter++) { - tmp_val_a =netlbl_getinc_u32 (&msg, &msg_len); - tmp_val_b =netlbl_getinc_u8 (&msg, &msg_len); - -if (tmp_val_a >= doi_def->map.std->lvl.local_size || - tmp_val_b >= doi_def->map.std->lvl.cipso_size) - goto add_std_failure; - - doi_def->map.std->lvl.cipso[tmp_val_b] = tmp_val_a; - doi_def->map.std->lvl.local[tmp_val_a] = tmp_val_b; - } - -for (iter =0 ; iter < num_cats; iter++) { - tmp_val_a =netlbl_getinc_u32 (&msg, &msg_len); - tmp_val_b =netlbl_getinc_u16 (&msg, &msg_len); - -if (tmp_val_a >= doi_def->map.std->cat.local_size || - tmp_val_b >= doi_def->map.std->cat.cipso_size) +if (doi_def->map.std->cat.cipso ==NULL ) { + ret_val = -ENOMEM ; goto add_std_failure; - - doi_def->map.std->cat.cipso[tmp_val_b] = tmp_val_a; - doi_def->map.std->cat.local[tmp_val_a] = tmp_val_b; + } +nla_for_each_nested (nla_a, + info->attrs[NLBL_CIPSOV4_A_MLSCATLST ], + nla_a_rem) +if (nla_a->nla_type ==NLBL_CIPSOV4_A_MLSCAT ) { +struct nlattr *cat_loc; +struct nlattr *cat_rem; + + cat_loc =nla_find_nested (nla_a, +NLBL_CIPSOV4_A_MLSCATLOC ); + cat_rem =nla_find_nested (nla_a, +NLBL_CIPSOV4_A_MLSCATREM ); +if (cat_loc ==NULL || cat_rem ==NULL ) + goto add_std_failure; + doi_def->map.std->cat.local[ +nla_get_u32 (cat_loc)] = +nla_get_u32 (cat_rem); + doi_def->map.std->cat.cipso[ +nla_get_u32 (cat_rem)] = +nla_get_u32 (cat_loc); + } } - doi_def->doi = doi; ret_val =cipso_v4_doi_add (doi_def);if (ret_val !=0 ) goto add_std_failure;
@@ -243,9 +331,7 @@ add_std_failure:/** * netlbl_cipsov4_add_pass - Adds a CIPSO V4 DOI definition -* @doi: the DOI value -* @msg: the ADD message data -* @msg_size: the size of the ADD message buffer +* @info: the Generic NETLINK info block * * Description: * Create a new CIPSO_V4_MAP_PASS DOI definition based on the given ADD message
@@ -253,52 +339,31 @@ add_std_failure:* error. * */ -static int netlbl_cipsov4_add_pass (u32 doi, -struct nlattr *msg, -size_t msg_size) +static int netlbl_cipsov4_add_pass (struct genl_info *info) { -int ret_val = -EINVAL ; -int msg_len = msg_size; -u32 num_tags; +int ret_val;struct cipso_v4_doi *doi_def =NULL ; -u32 iter; -if (msg_len <NETLBL_LEN_U32 ) - goto add_pass_failure; - num_tags =netlbl_getinc_u32 (&msg, &msg_len); -if (num_tags ==0 || num_tags >CIPSO_V4_TAG_MAXCNT ) - goto add_pass_failure; +if (!info->attrs[NLBL_CIPSOV4_A_DOI ] || + !info->attrs[NLBL_CIPSOV4_A_TAGLST ]) +return -EINVAL ; doi_def =kmalloc (sizeof (*doi_def),GFP_KERNEL ); -if (doi_def ==NULL ) { - ret_val = -ENOMEM ; - goto add_pass_failure; - } +if (doi_def ==NULL ) +return -ENOMEM ; doi_def->type =CIPSO_V4_MAP_PASS ; -for (iter =0 ; iter < num_tags; iter++) { -if (msg_len <NETLBL_LEN_U8 ) - goto add_pass_failure; - doi_def->tags[iter] =netlbl_getinc_u8 (&msg, &msg_len); -switch (doi_def->tags[iter]) { -case CIPSO_V4_TAG_RBITMAP : -break ; -default : - goto add_pass_failure; - } - } -if (iter <CIPSO_V4_TAG_MAXCNT ) - doi_def->tags[iter] =CIPSO_V4_TAG_INVALID ; + ret_val =netlbl_cipsov4_add_common (info, doi_def); +if (ret_val !=0 ) + goto add_pass_failure; - doi_def->doi = doi; ret_val =cipso_v4_doi_add (doi_def);if (ret_val !=0 ) goto add_pass_failure;return 0 ; add_pass_failure: -if (doi_def) -netlbl_cipsov4_doi_free (&doi_def->rcu); +netlbl_cipsov4_doi_free (&doi_def->rcu);return ret_val; }
@@ -316,34 +381,21 @@ static int netlbl_cipsov4_add(struct sk_ {int ret_val = -EINVAL ; -u32 doi;u32 map_type; -int msg_len =netlbl_netlink_payload_len (skb); -struct nlattr *msg =netlbl_netlink_payload_data (skb); - - ret_val =netlbl_netlink_cap_check (skb,CAP_NET_ADMIN ); -if (ret_val !=0 ) - goto add_return; -if (msg_len <2 *NETLBL_LEN_U32 ) - goto add_return; +if (!info->attrs[NLBL_CIPSOV4_A_MTYPE ]) +return -EINVAL ; - doi =netlbl_getinc_u32 (&msg, &msg_len); - map_type =netlbl_getinc_u32 (&msg, &msg_len); + map_type =nla_get_u32 (info->attrs[NLBL_CIPSOV4_A_MTYPE ]);switch (map_type) {case CIPSO_V4_MAP_STD : - ret_val =netlbl_cipsov4_add_std (doi, msg, msg_len); + ret_val =netlbl_cipsov4_add_std (info);break ;case CIPSO_V4_MAP_PASS : - ret_val =netlbl_cipsov4_add_pass (doi, msg, msg_len); + ret_val =netlbl_cipsov4_add_pass (info);break ; } -add_return: -netlbl_netlink_send_ack (info, - netlbl_cipsov4_gnl_family.id, -NLBL_CIPSOV4_C_ACK , - -ret_val);return ret_val; }
@@ -353,84 +405,239 @@ add_return:* @info: the Generic NETLINK info block * * Description: -* Process a user generated LIST message and respond accordingly. Returns -* zero on success and negative values on error. +* Process a user generated LIST message and respond accordingly. While the +* response message generated by the kernel is straightforward, determining +* before hand the size of the buffer to allocate is not (we have to generate +* the message to know the size). In order to keep this function sane what we +* do is allocate a buffer of NLMSG_GOODSIZE and try to fit the response in +* that size, if we fail then we restart with a larger buffer and try again. +* We continue in this manner until we hit a limit of failed attempts then we +* give up and just send an error message. Returns zero on success and +* negative values on error. * */ static int netlbl_cipsov4_list (struct sk_buff *skb,struct genl_info *info) { -int ret_val = -EINVAL ; +int ret_val; +struct sk_buff *ans_skb =NULL ; +u32 nlsze_mult =1 ; +void *data;u32 doi; -struct nlattr *msg =netlbl_netlink_payload_data (skb); -struct sk_buff *ans_skb; +struct nlattr *nla_a; +struct nlattr *nla_b; +struct cipso_v4_doi *doi_def; +u32 iter; -if (netlbl_netlink_payload_len (skb) !=NETLBL_LEN_U32 ) +if (!info->attrs[NLBL_CIPSOV4_A_DOI ]) { + ret_val = -EINVAL ; goto list_failure; + } - doi =nla_get_u32 (msg); - ans_skb =cipso_v4_doi_dump (doi,NLMSG_SPACE (GENL_HDRLEN )); +list_start: + ans_skb =nlmsg_new (NLMSG_GOODSIZE * nlsze_mult,GFP_KERNEL );if (ans_skb ==NULL ) { ret_val = -ENOMEM ; goto list_failure; } -netlbl_netlink_hdr_push (ans_skb, - info->snd_pid, -0 , - netlbl_cipsov4_gnl_family.id, -NLBL_CIPSOV4_C_LIST ); + data =netlbl_netlink_hdr_put (ans_skb, + info->snd_pid, + info->snd_seq, + netlbl_cipsov4_gnl_family.id, +0 , +NLBL_CIPSOV4_C_LIST ); +if (data ==NULL ) { + ret_val = -ENOMEM ; + goto list_failure; + } + + doi =nla_get_u32 (info->attrs[NLBL_CIPSOV4_A_DOI ]); + +rcu_read_lock (); + doi_def =cipso_v4_doi_getdef (doi); +if (doi_def ==NULL ) { + ret_val = -EINVAL ; + goto list_failure; + } + + ret_val =nla_put_u32 (ans_skb,NLBL_CIPSOV4_A_MTYPE , doi_def->type); +if (ret_val !=0 ) + goto list_failure_lock; + + nla_a =nla_nest_start (ans_skb,NLBL_CIPSOV4_A_TAGLST ); +if (nla_a ==NULL ) { + ret_val = -ENOMEM ; + goto list_failure_lock; + } +for (iter =0 ; + iter <CIPSO_V4_TAG_MAXCNT && + doi_def->tags[iter] !=CIPSO_V4_TAG_INVALID ; + iter++) { + ret_val =nla_put_u8 (ans_skb, +NLBL_CIPSOV4_A_TAG , + doi_def->tags[iter]); +if (ret_val !=0 ) + goto list_failure_lock; + } +nla_nest_end (ans_skb, nla_a); + +switch (doi_def->type) { +case CIPSO_V4_MAP_STD : + nla_a =nla_nest_start (ans_skb,NLBL_CIPSOV4_A_MLSLVLLST ); +if (nla_a ==NULL ) { + ret_val = -ENOMEM ; + goto list_failure_lock; + } +for (iter =0 ; + iter < doi_def->map.std->lvl.local_size; + iter++) { +if (doi_def->map.std->lvl.local[iter] == +CIPSO_V4_INV_LVL ) +continue ; + + nla_b =nla_nest_start (ans_skb,NLBL_CIPSOV4_A_MLSLVL ); +if (nla_b ==NULL ) { + ret_val = -ENOMEM ; + goto list_retry; + } + ret_val =nla_put_u32 (ans_skb, +NLBL_CIPSOV4_A_MLSLVLLOC , + iter); +if (ret_val !=0 ) + goto list_retry; + ret_val =nla_put_u32 (ans_skb, +NLBL_CIPSOV4_A_MLSLVLREM , + doi_def->map.std->lvl.local[iter]); +if (ret_val !=0 ) + goto list_retry; +nla_nest_end (ans_skb, nla_b); + } +nla_nest_end (ans_skb, nla_a); + + nla_a =nla_nest_start (ans_skb,NLBL_CIPSOV4_A_MLSCATLST ); +if (nla_a ==NULL ) { + ret_val = -ENOMEM ; + goto list_retry; + } +for (iter =0 ; + iter < doi_def->map.std->cat.local_size; + iter++) { +if (doi_def->map.std->cat.local[iter] == +CIPSO_V4_INV_CAT ) +continue ; + + nla_b =nla_nest_start (ans_skb,NLBL_CIPSOV4_A_MLSCAT ); +if (nla_b ==NULL ) { + ret_val = -ENOMEM ; + goto list_retry; + } + ret_val =nla_put_u32 (ans_skb, +NLBL_CIPSOV4_A_MLSCATLOC , + iter); +if (ret_val !=0 ) + goto list_retry; + ret_val =nla_put_u32 (ans_skb, +NLBL_CIPSOV4_A_MLSCATREM , + doi_def->map.std->cat.local[iter]); +if (ret_val !=0 ) + goto list_retry; +nla_nest_end (ans_skb, nla_b); + } +nla_nest_end (ans_skb, nla_a); + +break ; + } +rcu_read_unlock (); + +genlmsg_end (ans_skb, data); - ret_val =netlbl_netlink_snd (ans_skb, info->snd_pid); + ret_val =genlmsg_unicast (ans_skb, info->snd_pid);if (ret_val !=0 ) goto list_failure;return 0 ; +list_retry: +/* XXX - this limit is a guesstimate */ +if (nlsze_mult <4 ) { +rcu_read_unlock (); +kfree_skb (ans_skb); + nlsze_mult++; + goto list_start; + } +list_failure_lock: +rcu_read_unlock (); list_failure: -netlbl_netlink_send_ack (info, - netlbl_cipsov4_gnl_family.id, -NLBL_CIPSOV4_C_ACK , - -ret_val); +kfree_skb (ans_skb); +return ret_val; +} + +/** +* netlbl_cipsov4_listall_cb - cipso_v4_doi_walk() callback for LISTALL +* @doi_def: the CIPSOv4 DOI definition +* @arg: the netlbl_cipsov4_doiwalk_arg structure +* +* Description: +* This function is designed to be used as a callback to the +* cipso_v4_doi_walk() function for use in generating a response for a LISTALL +* message. Returns the size of the message on success, negative values on +* failure. +* +*/ +static int netlbl_cipsov4_listall_cb (struct cipso_v4_doi *doi_def,void *arg) +{ +int ret_val = -ENOMEM ; +struct netlbl_cipsov4_doiwalk_arg *cb_arg = arg; +void *data; + + data =netlbl_netlink_hdr_put (cb_arg->skb, +NETLINK_CB (cb_arg->nl_cb->skb).pid, + cb_arg->seq, + netlbl_cipsov4_gnl_family.id, +NLM_F_MULTI , +NLBL_CIPSOV4_C_LISTALL ); +if (data ==NULL ) + goto listall_cb_failure; + + ret_val =nla_put_u32 (cb_arg->skb,NLBL_CIPSOV4_A_DOI , doi_def->doi); +if (ret_val !=0 ) + goto listall_cb_failure; + ret_val =nla_put_u32 (cb_arg->skb, +NLBL_CIPSOV4_A_MTYPE , + doi_def->type); +if (ret_val !=0 ) + goto listall_cb_failure; + +return genlmsg_end (cb_arg->skb, data); + +listall_cb_failure: +genlmsg_cancel (cb_arg->skb, data);return ret_val; }/** * netlbl_cipsov4_listall - Handle a LISTALL message * @skb: the NETLINK buffer -* @info: the Generic NETLINK info block +* @cb: the NETLINK callback * * Description: * Process a user generated LISTALL message and respond accordingly. Returns * zero on success and negative values on error. * */ -static int netlbl_cipsov4_listall (struct sk_buff *skb,struct genl_info *info) +static int netlbl_cipsov4_listall (struct sk_buff *skb, +struct netlink_callback *cb) { -int ret_val = -EINVAL ; -struct sk_buff *ans_skb; +struct netlbl_cipsov4_doiwalk_arg cb_arg; +int doi_skip = cb->args[0 ]; - ans_skb =cipso_v4_doi_dump_all (NLMSG_SPACE (GENL_HDRLEN )); -if (ans_skb ==NULL ) { - ret_val = -ENOMEM ; - goto listall_failure; - } -netlbl_netlink_hdr_push (ans_skb, - info->snd_pid, -0 , - netlbl_cipsov4_gnl_family.id, -NLBL_CIPSOV4_C_LISTALL ); + cb_arg.nl_cb = cb; + cb_arg.skb = skb; + cb_arg.seq = cb->nlh->nlmsg_seq; - ret_val =netlbl_netlink_snd (ans_skb, info->snd_pid); -if (ret_val !=0 ) - goto listall_failure; - -return 0 ; +cipso_v4_doi_walk (&doi_skip, netlbl_cipsov4_listall_cb, &cb_arg); -listall_failure: -netlbl_netlink_send_ack (info, - netlbl_cipsov4_gnl_family.id, -NLBL_CIPSOV4_C_ACK , - -ret_val); -return ret_val; + cb->args[0 ] = doi_skip; +return skb->len; }/**
@@ -445,27 +652,14 @@ listall_failure:*/ static int netlbl_cipsov4_remove (struct sk_buff *skb,struct genl_info *info) { -int ret_val; +int ret_val = -EINVAL ;u32 doi; -struct nlattr *msg =netlbl_netlink_payload_data (skb); - ret_val =netlbl_netlink_cap_check (skb,CAP_NET_ADMIN ); -if (ret_val !=0 ) - goto remove_return; - -if (netlbl_netlink_payload_len (skb) !=NETLBL_LEN_U32 ) { - ret_val = -EINVAL ; - goto remove_return; +if (info->attrs[NLBL_CIPSOV4_A_DOI ]) { + doi =nla_get_u32 (info->attrs[NLBL_CIPSOV4_A_DOI ]); + ret_val =cipso_v4_doi_remove (doi, netlbl_cipsov4_doi_free); } - doi =nla_get_u32 (msg); - ret_val =cipso_v4_doi_remove (doi, netlbl_cipsov4_doi_free); - -remove_return: -netlbl_netlink_send_ack (info, - netlbl_cipsov4_gnl_family.id, -NLBL_CIPSOV4_C_ACK , - -ret_val);return ret_val; }
@@ -475,14 +669,16 @@ remove_return:static struct genl_ops netlbl_cipsov4_genl_c_add = { .cmd =NLBL_CIPSOV4_C_ADD , - .flags =0 , + .flags =GENL_ADMIN_PERM , + .policy = netlbl_cipsov4_genl_policy, .doit = netlbl_cipsov4_add, .dumpit =NULL , };static struct genl_ops netlbl_cipsov4_genl_c_remove = { .cmd =NLBL_CIPSOV4_C_REMOVE , - .flags =0 , + .flags =GENL_ADMIN_PERM , + .policy = netlbl_cipsov4_genl_policy, .doit = netlbl_cipsov4_remove, .dumpit =NULL , };
@@ -490,6 +686,7 @@ static struct genl_ops netlbl_cipsov4_gestatic struct genl_ops netlbl_cipsov4_genl_c_list = { .cmd =NLBL_CIPSOV4_C_LIST , .flags =0 , + .policy = netlbl_cipsov4_genl_policy, .doit = netlbl_cipsov4_list, .dumpit =NULL , };
@@ -497,8 +694,9 @@ static struct genl_ops netlbl_cipsov4_gestatic struct genl_ops netlbl_cipsov4_genl_c_listall = { .cmd =NLBL_CIPSOV4_C_LISTALL , .flags =0 , - .doit = netlbl_cipsov4_listall, - .dumpit =NULL , + .policy = netlbl_cipsov4_genl_policy, + .doit =NULL , + .dumpit = netlbl_cipsov4_listall, };/*
net/netlabel/netlabel_cipso_v4.h +92 -143
273 lines not on this page · raw message
net/netlabel/netlabel_mgmt.c +273 -262
752 lines not on this page · raw message
net/netlabel/netlabel_mgmt.h +69 -144
281 lines not on this page · raw message
net/netlabel/netlabel_unlabeled.c +35 -44
137 lines not on this page · raw message
net/netlabel/netlabel_unlabeled.h +16 -25
72 lines not on this page · raw message
--
paul moore
linux security @ hp
Quoted 6 lines · On Mon, 25 Sep 2006, [email protected] wrote:
This is an updated patchset which takes into account Thomas' comments. This includes the addition of two new patches in the patchset which add a new Netlink interface as well as correct the list of interfaces in the large comment block at the top of
include/net/netlink.h.Please consider these patches for 2.6.19, thanks.
All patches -
Dave, I think these should be applied now and queued for 2.6.19.
Signature · 2 lines
James Morris <[email protected]>
* [email protected] <[email protected]> 2006-09-25 14:04
Quoted 6 lines
This is an updated patchset which takes into account Thomas' comments. This includes the addition of two new patches in the patchset which add a new Netlink interface as well as correct the list of interfaces in the large comment block at the top of
include/net/netlink.h.Please consider these patches for 2.6.19, thanks.
Looks great.
David Miller
maintainerFrom: [email protected]
Date: Mon, 25 Sep 2006 14:04:12 -0400
Quoted 6 lines
This is an updated patchset which takes into account Thomas' comments. This includes the addition of two new patches in the patchset which add a new Netlink interface as well as correct the list of interfaces in the large comment block at the top of
include/net/netlink.h.Please consider these patches for 2.6.19, thanks.
All applied, thanks Paul.