Attachment 150672 Details for Bug 233387 – Patch adds security check when flushing spd and sad.

[patch] Patch adds security check when flushing spd and sad.

patch.0321 (text/plain), 1.41 KB, created by Joy Latten on 2007-03-22 16:12:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joy Latten

Created: 2007-03-22 16:12:23 UTC

Size: 1.41 KB

patch

obsolete

>diff -urpN linux-2.6.20.orig/net/xfrm/xfrm_policy.c linux-2.6.20/net/xfrm/xfrm_policy.c
>--- linux-2.6.20.orig/net/xfrm/xfrm_policy.c	2007-03-21 14:25:51.000000000 -0500
>+++ linux-2.6.20/net/xfrm/xfrm_policy.c	2007-03-21 14:30:59.000000000 -0500
>@@ -829,6 +829,8 @@ void xfrm_policy_flush(u8 type, struct x
> 				     &xfrm_policy_inexact[dir], bydst) {
> 			if (pol->type != type)
> 				continue;
>+			if (security_xfrm_policy_delete(pol))
>+				continue;
> 			hlist_del(&pol->bydst);
> 			hlist_del(&pol->byidx);
> 			write_unlock_bh(&xfrm_policy_lock);
>@@ -850,6 +852,8 @@ void xfrm_policy_flush(u8 type, struct x
> 					     bydst) {
> 				if (pol->type != type)
> 					continue;
>+				if (security_xfrm_policy_delete(pol))
>+					continue;
> 				hlist_del(&pol->bydst);
> 				hlist_del(&pol->byidx);
> 				write_unlock_bh(&xfrm_policy_lock);
>diff -urpN linux-2.6.20.orig/net/xfrm/xfrm_state.c linux-2.6.20/net/xfrm/xfrm_state.c
>--- linux-2.6.20.orig/net/xfrm/xfrm_state.c	2007-03-21 14:25:51.000000000 -0500
>+++ linux-2.6.20/net/xfrm/xfrm_state.c	2007-03-21 14:27:48.000000000 -0500
>@@ -400,7 +400,8 @@ void xfrm_state_flush(u8 proto, struct x
> restart:
> 		hlist_for_each_entry(x, entry, xfrm_state_bydst+i, bydst) {
> 			if (!xfrm_state_kern(x) &&
>-			    xfrm_id_proto_match(x->id.proto, proto)) {
>+			    xfrm_id_proto_match(x->id.proto, proto) &&
>+			    !security_xfrm_state_delete(x)) {
> 				xfrm_state_hold(x);
> 				spin_unlock_bh(&xfrm_state_lock);
>

Actions: View | Diff

Attachments on bug 233387: 150672