Attachment 148347 Details for Bug 228422 – LSPP.65 kernel patch for this issue.

[patch] LSPP.65 kernel patch for this issue.

6.228422.patch (text/plain), 2.38 KB, created by Eric Paris on 2007-02-19 17:24:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Paris

Created: 2007-02-19 17:24:31 UTC

Size: 2.38 KB

patch

obsolete

>--- linux-2.6.18.i686/net/key/af_key.c.pre.228422	2007-02-15 17:30:45.000000000 -0500
>+++ linux-2.6.18.i686/net/key/af_key.c	2007-02-16 13:59:03.000000000 -0500
>@@ -2285,16 +2285,17 @@ static int pfkey_spddelete(struct sock *
> 	xp = xfrm_policy_bysel_ctx(pol->sadb_x_policy_dir-1, &sel, tmp.security, 1);
> 	security_xfrm_policy_free(&tmp);
> 
>-	xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
>-		       AUDIT_MAC_IPSEC_DELSPD, (xp) ? 1 : 0, xp, NULL);
>-
> 	if (xp == NULL)
> 		return -ENOENT;
> 
>-	err = 0;
>+	err = security_xfrm_policy_delete(xp);
> 
>-	if ((err = security_xfrm_policy_delete(xp)))
>+	xfrm_audit_log(audit_get_loginuid(current->audit_context), 0,
>+		       AUDIT_MAC_IPSEC_DELSPD, err ? 0 : 1, xp, NULL);
>+
>+	if (err)
> 		goto out;
>+
> 	c.seq = hdr->sadb_msg_seq;
> 	c.pid = hdr->sadb_msg_pid;
> 	c.event = XFRM_MSG_DELPOLICY;
>--- linux-2.6.18.i686/net/xfrm/xfrm_user.c.pre.228422	2007-02-16 13:58:45.000000000 -0500
>+++ linux-2.6.18.i686/net/xfrm/xfrm_user.c	2007-02-16 13:59:03.000000000 -0500
>@@ -1066,10 +1066,6 @@ static int xfrm_get_policy(struct sk_buf
> 		xp = xfrm_policy_bysel_ctx(p->dir, &p->sel, tmp.security, delete);
> 		security_xfrm_policy_free(&tmp);
> 	}
>-	if (delete)
>-		xfrm_audit_log(NETLINK_CB(skb).loginuid, NETLINK_CB(skb).sid,
>-			       AUDIT_MAC_IPSEC_DELSPD, (xp) ? 1 : 0, xp, NULL);
>-
> 	if (xp == NULL)
> 		return -ENOENT;
> 
>@@ -1085,8 +1081,14 @@ static int xfrm_get_policy(struct sk_buf
> 					      MSG_DONTWAIT);
> 		}
> 	} else {
>-		if ((err = security_xfrm_policy_delete(xp)) != 0)
>+		err = security_xfrm_policy_delete(xp);
>+
>+		xfrm_audit_log(NETLINK_CB(skb).loginuid, NETLINK_CB(skb).sid,
>+			       AUDIT_MAC_IPSEC_DELSPD, err ? 0 : 1, xp, NULL);
>+
>+		if (err != 0)
> 			goto out;
>+
> 		c.data.byid = p->index;
> 		c.event = nlh->nlmsg_type;
> 		c.seq = nlh->nlmsg_seq;
>--- linux-2.6.18.i686/net/xfrm/xfrm_policy.c.pre.228422	2007-02-16 13:58:45.000000000 -0500
>+++ linux-2.6.18.i686/net/xfrm/xfrm_policy.c	2007-02-16 13:59:03.000000000 -0500
>@@ -1393,9 +1393,14 @@ void xfrm_audit_log(uid_t auid, u32 sid,
> 	if (audit_enabled == 0)
> 		return;
> 
>+	BUG_ON((type == AUDIT_MAC_IPSEC_ADDSA ||
>+		type == AUDIT_MAC_IPSEC_DELSA) && !x);
>+	BUG_ON((type == AUDIT_MAC_IPSEC_ADDSPD ||
>+		type == AUDIT_MAC_IPSEC_DELSPD) && !xp);
>+
> 	audit_buf = audit_log_start(current->audit_context, GFP_ATOMIC, type);
> 	if (audit_buf == NULL)
>-	return;
>+		return;
> 
> 	switch(type) {
> 	case AUDIT_MAC_IPSEC_ADDSA:

Actions: View | Diff

Attachments on bug 228422: 148347