In article <[EMAIL PROTECTED]> (at Tue, 11 Dec 2007 11:30:19 -0500), Paul Moore <[EMAIL PROTECTED]> says:
> diff --git a/net/xfrm/xfrm_state.c b/net/xfrm/xfrm_state.c > index 5b860b6..e2a3dd1 100644 > --- a/net/xfrm/xfrm_state.c > +++ b/net/xfrm/xfrm_state.c : > @@ -1994,67 +1995,59 @@ void __init xfrm_state_init(void) > static inline void xfrm_audit_common_stateinfo(struct xfrm_state *x, > struct audit_buffer *audit_buf) > { > - if (x->security) > - audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u sec_obj=%s", > - x->security->ctx_alg, x->security->ctx_doi, > - x->security->ctx_str); > + struct xfrm_sec_ctx *ctx = x->security; > + u32 spi = ntohl(x->id.spi); > > - switch(x->props.family) { > - case AF_INET: > - audit_log_format(audit_buf, " src=%u.%u.%u.%u dst=%u.%u.%u.%u", > - NIPQUAD(x->props.saddr.a4), > - NIPQUAD(x->id.daddr.a4)); > - break; > - case AF_INET6: > - { > - struct in6_addr saddr6, daddr6; > - > - memcpy(&saddr6, x->props.saddr.a6, > - sizeof(struct in6_addr)); > - memcpy(&daddr6, x->id.daddr.a6, > - sizeof(struct in6_addr)); > - audit_log_format(audit_buf, > - " src=" NIP6_FMT " dst=" NIP6_FMT, > - NIP6(saddr6), NIP6(daddr6)); > - } > - break; > - } > + if (ctx) > + audit_log_format(audit_buf, " sec_alg=%u sec_doi=%u > sec_obj=%s", > + ctx->ctx_alg, ctx->ctx_doi, ctx->ctx_str); > + > + switch(x->props.family) { > + case AF_INET: > + audit_log_format(audit_buf, > + " src=" NIPQUAD_FMT " dst=" NIPQUAD_FMT, > + NIPQUAD(x->props.saddr.a4), > + NIPQUAD(x->id.daddr.a4)); > + break; > + case AF_INET6: > + audit_log_format(audit_buf, > + " src=" NIP6_FMT " dst=" NIP6_FMT, > + NIP6(*(struct in6_addr *)x->props.saddr.a6), > + NIP6(*(struct in6_addr *)x->id.daddr.a6)); > + break; > + } > + > + audit_log_format(audit_buf, " spi=%u(0x%x)", spi, spi); > } > Please do not mangle tabs into spaces. --yoshfuji -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html