On Thu, Oct 30, 2008 at 1:13 AM, Paul Moore <paul.moore@xxxxxx> wrote:
> On Wednesday 29 October 2008 2:27:44 pm you wrote:
>> Hi Paul,
>>
>> Does this look better ?? Appreciate your help. Patch compile tested.
>>
>> Enable netlabel auditing functions only when CONFIG_AUDIT is set
>>
>> Signed-off-by: Manish Katiyar <mkatiyar@xxxxxxxxx>
>
> Much better, just some style nits noted below that need to be
> addressed ...
Hi Paul,
Updated patch below as per your comments.
Enable netlabel auditing functions only when CONFIG_AUDIT is set
Signed-off-by: Manish Katiyar <mkatiyar@xxxxxxxxx>
---
net/netlabel/netlabel_addrlist.c | 2 ++
net/netlabel/netlabel_addrlist.h | 22 ++++++++++++++++++++++
2 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/net/netlabel/netlabel_addrlist.c b/net/netlabel/netlabel_addrlist.c
index b0925a3..3fe73c2 100644
--- a/net/netlabel/netlabel_addrlist.c
+++ b/net/netlabel/netlabel_addrlist.c
@@ -327,6 +327,7 @@ struct netlbl_af6list *netlbl_af6list_remove(const
struct in6_addr *addr,
* Write the IPv4 address and address mask, if necessary, to @audit_buf.
*
*/
+#ifdef CONFIG_AUDIT
void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
int src, const char *dev,
__be32 addr, __be32 mask)
@@ -386,3 +387,4 @@ void netlbl_af6list_audit_addr(struct audit_buffer
*audit_buf,
}
}
#endif /* IPv6 */
+#endif /* CONFIG_AUDIT */
diff --git a/net/netlabel/netlabel_addrlist.h b/net/netlabel/netlabel_addrlist.h
index 0242bea..3212965 100644
--- a/net/netlabel/netlabel_addrlist.h
+++ b/net/netlabel/netlabel_addrlist.h
@@ -120,9 +120,19 @@ struct netlbl_af4list *netlbl_af4list_search(__be32 addr,
struct netlbl_af4list *netlbl_af4list_search_exact(__be32 addr,
__be32 mask,
struct list_head *head);
+
+#ifdef CONFIG_AUDIT
void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
int src, const char *dev,
__be32 addr, __be32 mask);
+#else
+static inline void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
+ int src, const char *dev,
+ __be32 addr, __be32 mask)
+{
+ return;
+}
+#endif
#if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
@@ -179,11 +189,23 @@ struct netlbl_af6list
*netlbl_af6list_search(const struct in6_addr *addr,
struct netlbl_af6list *netlbl_af6list_search_exact(const struct in6_addr *addr,
const struct in6_addr *mask,
struct list_head *head);
+
+#ifdef CONFIG_AUDIT
void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
int src,
const char *dev,
const struct in6_addr *addr,
const struct in6_addr *mask);
+#else
+static inline void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
+ int src,
+ const char *dev,
+ const struct in6_addr *addr,
+ const struct in6_addr *mask)
+{
+ return;
+}
+#endif
#endif /* IPV6 */
#endif
--
1.5.4.3
Thanks -
Manish
>
>> ---
>> net/netlabel/netlabel_addrlist.c | 2 ++
>> net/netlabel/netlabel_addrlist.h | 20 ++++++++++++++++++++
>> 2 files changed, 22 insertions(+), 0 deletions(-)
>>
>> diff --git a/net/netlabel/netlabel_addrlist.c
>> b/net/netlabel/netlabel_addrlist.c index b0925a3..830afef 100644
>> --- a/net/netlabel/netlabel_addrlist.c
>> +++ b/net/netlabel/netlabel_addrlist.c
>> @@ -311,6 +311,7 @@ struct netlbl_af6list
>> *netlbl_af6list_remove(const struct in6_addr *addr,
>> }
>> #endif /* IPv6 */
>>
>> +#ifdef CONFIG_AUDIT
>> /*
>> * Audit Helper Functions
>> */
>
> Why don't you move the #ifdef down here past the comment. Not a big
> deal but you need to respin the patch to fix another problem so why not
> fix this up too.
>
>> @@ -386,3 +387,4 @@ void netlbl_af6list_audit_addr(struct
>> audit_buffer *audit_buf,
>> }
>> }
>> #endif /* IPv6 */
>> +#endif /* CONFIG_AUDIT */
>> diff --git a/net/netlabel/netlabel_addrlist.h
>> b/net/netlabel/netlabel_addrlist.h index 0242bea..7fa730a 100644
>> --- a/net/netlabel/netlabel_addrlist.h
>> +++ b/net/netlabel/netlabel_addrlist.h
>> @@ -120,9 +120,18 @@ struct netlbl_af4list
>> *netlbl_af4list_search(__be32 addr, struct netlbl_af4list
>> *netlbl_af4list_search_exact(__be32 addr, __be32 mask,
>> struct list_head *head);
>> +
>> +#ifdef CONFIG_AUDIT
>> void netlbl_af4list_audit_addr(struct audit_buffer *audit_buf,
>> int src, const char *dev,
>> __be32 addr, __be32 mask);
>> +#else
>> +static inline void netlbl_af4list_audit_addr(struct audit_buffer
>> *audit_buf, + int src, const char *dev,
>> + __be32 addr, __be32 mask) {
>> + return;
>> +}
>> +#endif
>
> The curly braces for the function body need to be on a line of their
> own. See the two example below:
>
> void bad_style_func(void) {
> return;
> }
>
> void good_style_func(void)
> {
> return;
> }
>
>> #if defined(CONFIG_IPV6) || defined(CONFIG_IPV6_MODULE)
>>
>> @@ -179,11 +188,22 @@ struct netlbl_af6list
>> *netlbl_af6list_search(const struct in6_addr *addr,
>> struct netlbl_af6list *netlbl_af6list_search_exact(const struct
>> in6_addr *addr, const struct in6_addr *mask,
>> struct list_head *head);
>> +
>> +#ifdef CONFIG_AUDIT
>> void netlbl_af6list_audit_addr(struct audit_buffer *audit_buf,
>> int src,
>> const char *dev,
>> const struct in6_addr *addr,
>> const struct in6_addr *mask);
>> +#else
>> +static inline void netlbl_af6list_audit_addr(struct audit_buffer
>> *audit_buf, + int src,
>> + const char *dev,
>> + const struct in6_addr *addr,
>> + const struct in6_addr *mask) {
>> + return;
>> +}
>> +#endif
>
> Same curly brace problem.
>
> --
> paul moore
> linux @ hp
>
--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
