[PATCH 1/1] disable ipsec auditing in lspp 56 kernel

[PATCH 1/1] disable ipsec auditing in lspp 56 kernel

[Joy Latten]

Eric,

Here is a patch built against the lspp56 kernel to include
the ability to disable auditing in ipsec.
It is equivalent to the one I sent out for 2.6.19-rc6 kernel.
Sorry for the confusion. I hope this helps.

Regards,
Joy


diff -urpN linux-2.6.18.ppc64.orig/include/net/xfrm.h linux-2.6.18.ppc64.est/include/net/xfrm.h
--- linux-2.6.18.ppc64.orig/include/net/xfrm.h	2006-12-01 17:24:29.000000000 -0600
+++ linux-2.6.18.ppc64.est/include/net/xfrm.h	2006-12-01 17:40:25.000000000 -0600
@@ -379,8 +379,12 @@ struct xfrm_audit
 	uid_t	loginuid;
 	u32	secid;
 };
+#ifdef CONFIG_AUDITSYSCALL
 void xfrm_audit_log(uid_t auid, u32 secid, int type, int result, 
 			   struct xfrm_policy *xp, struct xfrm_state *x);
+#else
+#define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0)
+#endif /* CONFIG_AUDITSYSCALL */
 
 static inline void xfrm_pol_hold(struct xfrm_policy *policy)
 {
diff -urpN linux-2.6.18.ppc64.orig/net/xfrm/xfrm_policy.c linux-2.6.18.ppc64.est/net/xfrm/xfrm_policy.c
--- linux-2.6.18.ppc64.orig/net/xfrm/xfrm_policy.c	2006-12-01 17:25:22.000000000 -0600
+++ linux-2.6.18.ppc64.est/net/xfrm/xfrm_policy.c	2006-12-01 17:40:03.000000000 -0600
@@ -1370,6 +1370,7 @@ int xfrm_bundle_ok(struct xfrm_policy *p
 
 EXPORT_SYMBOL(xfrm_bundle_ok);
 
+#ifdef CONFIG_AUDITSYSCALL
 /* Audit addition and deletion of SAs and ipsec policy */
 
 void xfrm_audit_log(uid_t auid, u32 sid, int type, int result, 
@@ -1479,6 +1480,7 @@ void xfrm_audit_log(uid_t auid, u32 sid,
 }
 
 EXPORT_SYMBOL(xfrm_audit_log);
+#endif /* CONFIG_AUDITSYSCALL */
 
 int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
 {

Re: [PATCH 1/1] disable ipsec auditing in lspp 56 kernel

[Eric Paris]

Great!  The real problem I guess is that I missed it when it went by on
netdev.

Thanks!
-Eric

On Fri, 2006-12-01 at 18:53 -0600, Joy Latten wrote:
> Eric,
> 
> Here is a patch built against the lspp56 kernel to include
> the ability to disable auditing in ipsec.
> It is equivalent to the one I sent out for 2.6.19-rc6 kernel.
> Sorry for the confusion. I hope this helps.
> 
> Regards,
> Joy
> 
> 
> diff -urpN linux-2.6.18.ppc64.orig/include/net/xfrm.h linux-2.6.18.ppc64.est/include/net/xfrm.h
> --- linux-2.6.18.ppc64.orig/include/net/xfrm.h	2006-12-01 17:24:29.000000000 -0600
> +++ linux-2.6.18.ppc64.est/include/net/xfrm.h	2006-12-01 17:40:25.000000000 -0600
> @@ -379,8 +379,12 @@ struct xfrm_audit
>  	uid_t	loginuid;
>  	u32	secid;
>  };
> +#ifdef CONFIG_AUDITSYSCALL
>  void xfrm_audit_log(uid_t auid, u32 secid, int type, int result, 
>  			   struct xfrm_policy *xp, struct xfrm_state *x);
> +#else
> +#define xfrm_audit_log(a,s,t,r,p,x) do { ; } while (0)
> +#endif /* CONFIG_AUDITSYSCALL */
>  
>  static inline void xfrm_pol_hold(struct xfrm_policy *policy)
>  {
> diff -urpN linux-2.6.18.ppc64.orig/net/xfrm/xfrm_policy.c linux-2.6.18.ppc64.est/net/xfrm/xfrm_policy.c
> --- linux-2.6.18.ppc64.orig/net/xfrm/xfrm_policy.c	2006-12-01 17:25:22.000000000 -0600
> +++ linux-2.6.18.ppc64.est/net/xfrm/xfrm_policy.c	2006-12-01 17:40:03.000000000 -0600
> @@ -1370,6 +1370,7 @@ int xfrm_bundle_ok(struct xfrm_policy *p
>  
>  EXPORT_SYMBOL(xfrm_bundle_ok);
>  
> +#ifdef CONFIG_AUDITSYSCALL
>  /* Audit addition and deletion of SAs and ipsec policy */
>  
>  void xfrm_audit_log(uid_t auid, u32 sid, int type, int result, 
> @@ -1479,6 +1480,7 @@ void xfrm_audit_log(uid_t auid, u32 sid,
>  }
>  
>  EXPORT_SYMBOL(xfrm_audit_log);
> +#endif /* CONFIG_AUDITSYSCALL */
>  
>  int xfrm_policy_register_afinfo(struct xfrm_policy_afinfo *afinfo)
>  {
>