Commit afeb14b4 authored by Paul Moore's avatar Paul Moore Committed by David S. Miller
Browse files

[XFRM]: RFC4303 compliant auditing 



This patch adds a number of new IPsec audit events to meet the auditing
requirements of RFC4303.  This includes audit hooks for the following events:

 * Could not find a valid SA [sections 2.1, 3.4.2]
   . xfrm_audit_state_notfound()
   . xfrm_audit_state_notfound_simple()

 * Sequence number overflow [section 3.3.3]
   . xfrm_audit_state_replay_overflow()

 * Replayed packet [section 3.4.3]
   . xfrm_audit_state_replay()

 * Integrity check failure [sections 3.4.4.1, 3.4.4.2]
   . xfrm_audit_state_icvfail()

While RFC4304 deals only with ESP most of the changes in this patch apply to
IPsec in general, i.e. both AH and ESP.  The one case, integrity check
failure, where ESP specific code had to be modified the same was done to the
AH code for the sake of consistency.

Signed-off-by: default avatarPaul Moore <paul.moore@hp.com>
Acked-by: default avatarJames Morris <jmorris@namei.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dfd4f0ae

include/net/xfrm.h

+26 −7
Original line number Diff line number Diff line
@@ -565,26 +565,33 @@ struct xfrm_audit 
};



#ifdef CONFIG_AUDITSYSCALL

static inline struct audit_buffer *xfrm_audit_start(u32 auid, u32 secid)

static inline struct audit_buffer *xfrm_audit_start(const char *op)

{

	struct audit_buffer *audit_buf = NULL;

	char *secctx;

	u32 secctx_len;



	if (audit_enabled == 0)

		return NULL;

	audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC,

				    AUDIT_MAC_IPSEC_EVENT);

	if (audit_buf == NULL)

		return NULL;

	audit_log_format(audit_buf, "op=%s", op);

	return audit_buf;

}



	audit_log_format(audit_buf, "auid=%u", auid);

static inline void xfrm_audit_helper_usrinfo(u32 auid, u32 secid,

					     struct audit_buffer *audit_buf)

{

	char *secctx;

	u32 secctx_len;



	audit_log_format(audit_buf, " auid=%u", auid);

	if (secid != 0 &&

	    security_secid_to_secctx(secid, &secctx, &secctx_len) == 0) {

		audit_log_format(audit_buf, " subj=%s", secctx);

		security_release_secctx(secctx, secctx_len);

	} else

		audit_log_task_context(audit_buf);

	return audit_buf;

}



extern void xfrm_audit_policy_add(struct xfrm_policy *xp, int result,
@@ -595,11 +602,22 @@ extern void xfrm_audit_state_add(struct xfrm_state *x, int result, 
				 u32 auid, u32 secid);

extern void xfrm_audit_state_delete(struct xfrm_state *x, int result,

				    u32 auid, u32 secid);

extern void xfrm_audit_state_replay_overflow(struct xfrm_state *x,

					     struct sk_buff *skb);

extern void xfrm_audit_state_notfound_simple(struct sk_buff *skb, u16 family);

extern void xfrm_audit_state_notfound(struct sk_buff *skb, u16 family,

				      __be32 net_spi, __be32 net_seq);

extern void xfrm_audit_state_icvfail(struct xfrm_state *x,

				     struct sk_buff *skb, u8 proto);

#else

#define xfrm_audit_policy_add(x, r, a, s)	do { ; } while (0)

#define xfrm_audit_policy_delete(x, r, a, s)	do { ; } while (0)

#define xfrm_audit_state_add(x, r, a, s)	do { ; } while (0)

#define xfrm_audit_state_delete(x, r, a, s)	do { ; } while (0)

#define xfrm_audit_state_replay_overflow(x, s)	do { ; } while (0)

#define xfrm_audit_state_notfound_simple(s, f)	do { ; } while (0)

#define xfrm_audit_state_notfound(s, f, sp, sq)	do { ; } while (0)

#define xfrm_audit_state_icvfail(x, s, p)	do { ; } while (0)

#endif /* CONFIG_AUDITSYSCALL */



static inline void xfrm_pol_hold(struct xfrm_policy *policy)
@@ -1214,7 +1232,8 @@ extern int xfrm_state_delete(struct xfrm_state *x); 
extern int xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info);

extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);

extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si);

extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq);

extern int xfrm_replay_check(struct xfrm_state *x,

			     struct sk_buff *skb, __be32 seq);

extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);

extern void xfrm_replay_notify(struct xfrm_state *x, int event);

extern int xfrm_state_mtu(struct xfrm_state *x, int mtu);

net/ipv4/ah4.c

+3 −1
Original line number Diff line number Diff line
@@ -179,9 +179,11 @@ static int ah_input(struct xfrm_state *x, struct sk_buff *skb) 
		err = ah_mac_digest(ahp, skb, ah->auth_data);

		if (err)

			goto unlock;

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len))

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);

			err = -EBADMSG;

		}

	}

unlock:

	spin_unlock(&x->lock);

net/ipv4/esp4.c

+1 −0
Original line number Diff line number Diff line
@@ -191,6 +191,7 @@ static int esp_input(struct xfrm_state *x, struct sk_buff *skb) 
			BUG();



		if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP);

			err = -EBADMSG;

			goto unlock;

		}

net/ipv6/ah6.c

+1 −1
Original line number Diff line number Diff line
@@ -381,7 +381,7 @@ static int ah6_input(struct xfrm_state *x, struct sk_buff *skb) 
		if (err)

			goto unlock;

		if (memcmp(ahp->work_icv, auth_data, ahp->icv_trunc_len)) {

			LIMIT_NETDEBUG(KERN_WARNING "ipsec ah authentication error\n");

			xfrm_audit_state_icvfail(x, skb, IPPROTO_AH);

			err = -EBADMSG;

		}

	}

net/ipv6/esp6.c

+1 −0
Original line number Diff line number Diff line
@@ -186,6 +186,7 @@ static int esp6_input(struct xfrm_state *x, struct sk_buff *skb) 
			BUG();



		if (unlikely(memcmp(esp->auth.work_icv, sum, alen))) {

			xfrm_audit_state_icvfail(x, skb, IPPROTO_ESP);

			ret = -EBADMSG;

			goto unlock;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE