* [PATCH] netlabel: Remove unneeded in-kernel API functions
@ 2008-08-13 14:55 Paul Moore
2008-08-19 17:10 ` Paul Moore
0 siblings, 1 reply; 3+ messages in thread
From: Paul Moore @ 2008-08-13 14:55 UTC (permalink / raw)
To: netdev; +Cc: ramirose, casey
After some discussions with the Smack folks, well just Casey, I now have a
better idea of what Smack wants out of NetLabel in the future so I think it
is now safe to do some API "pruning". If another LSM comes along that
needs this functionality we can always add it back in, but I don't see any
LSMs on the horizon which might make use of these functions.
Thanks to Rami Rosen who suggested removing netlbl_cfg_cipsov4_del() back
in February 2008.
Signed-off-by: Paul Moore <paul.moore@hp.com>
---
include/net/netlabel.h | 13 -------
net/netlabel/netlabel_kapi.c | 80 +++++++++++-------------------------------
2 files changed, 21 insertions(+), 72 deletions(-)
diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index e4d2d6b..5303749 100644
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -352,12 +352,9 @@ static inline void netlbl_secattr_free(struct netlbl_lsm_secattr *secattr)
int netlbl_cfg_map_del(const char *domain, struct netlbl_audit *audit_info);
int netlbl_cfg_unlbl_add_map(const char *domain,
struct netlbl_audit *audit_info);
-int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
- struct netlbl_audit *audit_info);
int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
const char *domain,
struct netlbl_audit *audit_info);
-int netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit *audit_info);
/*
* LSM security attribute operations
@@ -404,22 +401,12 @@ static inline int netlbl_cfg_unlbl_add_map(const char *domain,
{
return -ENOSYS;
}
-static inline int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
- struct netlbl_audit *audit_info)
-{
- return -ENOSYS;
-}
static inline int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
const char *domain,
struct netlbl_audit *audit_info)
{
return -ENOSYS;
}
-static inline int netlbl_cfg_cipsov4_del(u32 doi,
- struct netlbl_audit *audit_info)
-{
- return -ENOSYS;
-}
static inline int netlbl_secattr_catmap_walk(
struct netlbl_lsm_secattr_catmap *catmap,
u32 offset)
diff --git a/net/netlabel/netlabel_kapi.c b/net/netlabel/netlabel_kapi.c
index 39793a1..2a2b8fa 100644
--- a/net/netlabel/netlabel_kapi.c
+++ b/net/netlabel/netlabel_kapi.c
@@ -104,49 +104,6 @@ cfg_unlbl_add_map_failure:
}
/**
- * netlbl_cfg_cipsov4_add - Add a new CIPSOv4 DOI definition
- * @doi_def: the DOI definition
- * @audit_info: NetLabel audit information
- *
- * Description:
- * Add a new CIPSOv4 DOI definition to the NetLabel subsystem. Returns zero on
- * success, negative values on failure.
- *
- */
-int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
- struct netlbl_audit *audit_info)
-{
- int ret_val;
- const char *type_str;
- struct audit_buffer *audit_buf;
-
- ret_val = cipso_v4_doi_add(doi_def);
-
- audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_ADD,
- audit_info);
- if (audit_buf != NULL) {
- switch (doi_def->type) {
- case CIPSO_V4_MAP_STD:
- type_str = "std";
- break;
- case CIPSO_V4_MAP_PASS:
- type_str = "pass";
- break;
- default:
- type_str = "(unknown)";
- }
- audit_log_format(audit_buf,
- " cipso_doi=%u cipso_type=%s res=%u",
- doi_def->doi,
- type_str,
- ret_val == 0 ? 1 : 0);
- audit_log_end(audit_buf);
- }
-
- return ret_val;
-}
-
-/**
* netlbl_cfg_cipsov4_add_map - Add a new CIPSOv4 DOI definition and mapping
* @doi_def: the DOI definition
* @domain: the domain mapping to add
@@ -165,6 +122,8 @@ int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
{
int ret_val = -ENOMEM;
struct netlbl_dom_map *entry;
+ const char *type_str;
+ struct audit_buffer *audit_buf;
entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
if (entry == NULL)
@@ -182,7 +141,7 @@ int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
* domain mapping for it. */
rcu_read_lock();
- ret_val = netlbl_cfg_cipsov4_add(doi_def, audit_info);
+ ret_val = cipso_v4_doi_add(doi_def);
if (ret_val != 0)
goto cfg_cipsov4_add_map_failure_unlock;
ret_val = netlbl_domhsh_add(entry, audit_info);
@@ -196,6 +155,24 @@ cfg_cipsov4_add_map_failure_remove_doi:
cipso_v4_doi_remove(doi_def->doi, audit_info, netlbl_cipsov4_doi_free);
cfg_cipsov4_add_map_failure_unlock:
rcu_read_unlock();
+ audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_ADD,
+ audit_info);
+ if (audit_buf != NULL) {
+ switch (doi_def->type) {
+ case CIPSO_V4_MAP_STD:
+ type_str = "std";
+ break;
+ case CIPSO_V4_MAP_PASS:
+ type_str = "pass";
+ break;
+ default:
+ type_str = "(unknown)";
+ }
+ audit_log_format(audit_buf,
+ " cipso_doi=%u cipso_type=%s res=%u",
+ doi_def->doi, type_str, ret_val == 0 ? 1 : 0);
+ audit_log_end(audit_buf);
+ }
cfg_cipsov4_add_map_failure:
if (entry != NULL)
kfree(entry->domain);
@@ -203,21 +180,6 @@ cfg_cipsov4_add_map_failure:
return ret_val;
}
-/**
- * netlbl_cfg_cipsov4_del - Removean existing CIPSOv4 DOI definition
- * @doi: the CIPSO DOI value
- * @audit_info: NetLabel audit information
- *
- * Description:
- * Removes an existing CIPSOv4 DOI definition from the NetLabel subsystem.
- * Returns zero on success, negative values on failure.
- *
- */
-int netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit *audit_info)
-{
- return cipso_v4_doi_remove(doi, audit_info, netlbl_cipsov4_doi_free);
-}
-
/*
* Security Attribute Functions
*/
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] netlabel: Remove unneeded in-kernel API functions
2008-08-13 14:55 [PATCH] netlabel: Remove unneeded in-kernel API functions Paul Moore
@ 2008-08-19 17:10 ` Paul Moore
2008-08-19 20:17 ` David Miller
0 siblings, 1 reply; 3+ messages in thread
From: Paul Moore @ 2008-08-19 17:10 UTC (permalink / raw)
To: davem; +Cc: netdev, ramirose, casey
On Wednesday 13 August 2008 10:55:26 am Paul Moore wrote:
> After some discussions with the Smack folks, well just Casey, I now
> have a better idea of what Smack wants out of NetLabel in the future
> so I think it is now safe to do some API "pruning". If another LSM
> comes along that needs this functionality we can always add it back
> in, but I don't see any LSMs on the horizon which might make use of
> these functions.
>
> Thanks to Rami Rosen who suggested removing netlbl_cfg_cipsov4_del()
> back in February 2008.
Hi Dave,
I didn't see this get pulled into your latest 2.6.27 push but I think
it's a good candidate for 2.6.27, it's dead code removal. If you
disagree, no problem, just let me know so I can throw it on my patchset
for 2.6.28.
Thanks.
> Signed-off-by: Paul Moore <paul.moore@hp.com>
> ---
>
> include/net/netlabel.h | 13 -------
> net/netlabel/netlabel_kapi.c | 80
> +++++++++++------------------------------- 2 files changed, 21
> insertions(+), 72 deletions(-)
>
> diff --git a/include/net/netlabel.h b/include/net/netlabel.h
> index e4d2d6b..5303749 100644
> --- a/include/net/netlabel.h
> +++ b/include/net/netlabel.h
> @@ -352,12 +352,9 @@ static inline void netlbl_secattr_free(struct
> netlbl_lsm_secattr *secattr) int netlbl_cfg_map_del(const char
> *domain, struct netlbl_audit *audit_info); int
> netlbl_cfg_unlbl_add_map(const char *domain,
> struct netlbl_audit *audit_info);
> -int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
> - struct netlbl_audit *audit_info);
> int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi *doi_def,
> const char *domain,
> struct netlbl_audit *audit_info);
> -int netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit
> *audit_info);
>
> /*
> * LSM security attribute operations
> @@ -404,22 +401,12 @@ static inline int
> netlbl_cfg_unlbl_add_map(const char *domain, {
> return -ENOSYS;
> }
> -static inline int netlbl_cfg_cipsov4_add(struct cipso_v4_doi
> *doi_def, - struct netlbl_audit *audit_info)
> -{
> - return -ENOSYS;
> -}
> static inline int netlbl_cfg_cipsov4_add_map(struct cipso_v4_doi
> *doi_def, const char *domain,
> struct netlbl_audit *audit_info)
> {
> return -ENOSYS;
> }
> -static inline int netlbl_cfg_cipsov4_del(u32 doi,
> - struct netlbl_audit *audit_info)
> -{
> - return -ENOSYS;
> -}
> static inline int netlbl_secattr_catmap_walk(
> struct netlbl_lsm_secattr_catmap
> *catmap, u32 offset)
> diff --git a/net/netlabel/netlabel_kapi.c
> b/net/netlabel/netlabel_kapi.c index 39793a1..2a2b8fa 100644
> --- a/net/netlabel/netlabel_kapi.c
> +++ b/net/netlabel/netlabel_kapi.c
> @@ -104,49 +104,6 @@ cfg_unlbl_add_map_failure:
> }
>
> /**
> - * netlbl_cfg_cipsov4_add - Add a new CIPSOv4 DOI definition
> - * @doi_def: the DOI definition
> - * @audit_info: NetLabel audit information
> - *
> - * Description:
> - * Add a new CIPSOv4 DOI definition to the NetLabel subsystem.
> Returns zero on - * success, negative values on failure.
> - *
> - */
> -int netlbl_cfg_cipsov4_add(struct cipso_v4_doi *doi_def,
> - struct netlbl_audit *audit_info)
> -{
> - int ret_val;
> - const char *type_str;
> - struct audit_buffer *audit_buf;
> -
> - ret_val = cipso_v4_doi_add(doi_def);
> -
> - audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_ADD,
> - audit_info);
> - if (audit_buf != NULL) {
> - switch (doi_def->type) {
> - case CIPSO_V4_MAP_STD:
> - type_str = "std";
> - break;
> - case CIPSO_V4_MAP_PASS:
> - type_str = "pass";
> - break;
> - default:
> - type_str = "(unknown)";
> - }
> - audit_log_format(audit_buf,
> - " cipso_doi=%u cipso_type=%s res=%u",
> - doi_def->doi,
> - type_str,
> - ret_val == 0 ? 1 : 0);
> - audit_log_end(audit_buf);
> - }
> -
> - return ret_val;
> -}
> -
> -/**
> * netlbl_cfg_cipsov4_add_map - Add a new CIPSOv4 DOI definition and
> mapping * @doi_def: the DOI definition
> * @domain: the domain mapping to add
> @@ -165,6 +122,8 @@ int netlbl_cfg_cipsov4_add_map(struct
> cipso_v4_doi *doi_def, {
> int ret_val = -ENOMEM;
> struct netlbl_dom_map *entry;
> + const char *type_str;
> + struct audit_buffer *audit_buf;
>
> entry = kzalloc(sizeof(*entry), GFP_ATOMIC);
> if (entry == NULL)
> @@ -182,7 +141,7 @@ int netlbl_cfg_cipsov4_add_map(struct
> cipso_v4_doi *doi_def, * domain mapping for it. */
>
> rcu_read_lock();
> - ret_val = netlbl_cfg_cipsov4_add(doi_def, audit_info);
> + ret_val = cipso_v4_doi_add(doi_def);
> if (ret_val != 0)
> goto cfg_cipsov4_add_map_failure_unlock;
> ret_val = netlbl_domhsh_add(entry, audit_info);
> @@ -196,6 +155,24 @@ cfg_cipsov4_add_map_failure_remove_doi:
> cipso_v4_doi_remove(doi_def->doi, audit_info,
> netlbl_cipsov4_doi_free); cfg_cipsov4_add_map_failure_unlock:
> rcu_read_unlock();
> + audit_buf = netlbl_audit_start_common(AUDIT_MAC_CIPSOV4_ADD,
> + audit_info);
> + if (audit_buf != NULL) {
> + switch (doi_def->type) {
> + case CIPSO_V4_MAP_STD:
> + type_str = "std";
> + break;
> + case CIPSO_V4_MAP_PASS:
> + type_str = "pass";
> + break;
> + default:
> + type_str = "(unknown)";
> + }
> + audit_log_format(audit_buf,
> + " cipso_doi=%u cipso_type=%s res=%u",
> + doi_def->doi, type_str, ret_val == 0 ? 1 : 0);
> + audit_log_end(audit_buf);
> + }
> cfg_cipsov4_add_map_failure:
> if (entry != NULL)
> kfree(entry->domain);
> @@ -203,21 +180,6 @@ cfg_cipsov4_add_map_failure:
> return ret_val;
> }
>
> -/**
> - * netlbl_cfg_cipsov4_del - Removean existing CIPSOv4 DOI definition
> - * @doi: the CIPSO DOI value
> - * @audit_info: NetLabel audit information
> - *
> - * Description:
> - * Removes an existing CIPSOv4 DOI definition from the NetLabel
> subsystem. - * Returns zero on success, negative values on failure.
> - *
> - */
> -int netlbl_cfg_cipsov4_del(u32 doi, struct netlbl_audit *audit_info)
> -{
> - return cipso_v4_doi_remove(doi, audit_info,
> netlbl_cipsov4_doi_free); -}
> -
> /*
> * Security Attribute Functions
> */
>
> --
> To unsubscribe from this list: send the line "unsubscribe netdev" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
paul moore
linux @ hp
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] netlabel: Remove unneeded in-kernel API functions
2008-08-19 17:10 ` Paul Moore
@ 2008-08-19 20:17 ` David Miller
0 siblings, 0 replies; 3+ messages in thread
From: David Miller @ 2008-08-19 20:17 UTC (permalink / raw)
To: paul.moore; +Cc: netdev, ramirose, casey
From: Paul Moore <paul.moore@hp.com>
Date: Tue, 19 Aug 2008 13:10:35 -0400
> I didn't see this get pulled into your latest 2.6.27 push but I think
> it's a good candidate for 2.6.27, it's dead code removal. If you
> disagree, no problem, just let me know so I can throw it on my patchset
> for 2.6.28.
Linus seems to think I'm already merging too much stuff:
http://marc.info/?l=linux-kernel&m=121916548518920&w=2
So yeah, I think this cleanup can wait for 2.6.28
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2008-08-19 20:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-13 14:55 [PATCH] netlabel: Remove unneeded in-kernel API functions Paul Moore
2008-08-19 17:10 ` Paul Moore
2008-08-19 20:17 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).