Attachment 152627 Details for Bug 235680 – updated patch

[patch] updated patch

ipsec-tools-0.6.5-leak.patch (text/plain), 2.38 KB, created by Steve Grubb on 2007-04-14 21:04:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Grubb

Created: 2007-04-14 21:04:16 UTC

Size: 2.38 KB

patch

obsolete

>diff -urp ipsec-tools-0.6.5.orig/src/racoon/main.c ipsec-tools-0.6.5/src/racoon/main.c
>--- ipsec-tools-0.6.5.orig/src/racoon/main.c	2007-04-14 16:00:16.000000000 -0400
>+++ ipsec-tools-0.6.5/src/racoon/main.c	2007-04-14 16:46:32.000000000 -0400
>@@ -163,7 +163,9 @@ main(ac, av)
> #ifdef DEBUG_RECORD_MALLOCATION
> 	DRM_init();
> #endif
>-
>+#ifdef HAVE_SECCTX
>+	init_avc();
>+#endif
> 	eay_init();
> 	initlcconf();
> 	initrmconf();
>diff -urp ipsec-tools-0.6.5.orig/src/racoon/policy.h ipsec-tools-0.6.5/src/racoon/policy.h
>--- ipsec-tools-0.6.5.orig/src/racoon/policy.h	2007-04-14 16:00:17.000000000 -0400
>+++ ipsec-tools-0.6.5/src/racoon/policy.h	2007-04-14 16:51:37.000000000 -0400
>@@ -154,6 +154,7 @@ extern const char *spidx2str __P((const 
> #ifdef HAVE_SECCTX
> #include <selinux/selinux.h>
> extern int get_security_context __P((vchar_t *, struct policyindex *));
>+extern void init_avc __P((void));
> extern int within_range __P((security_context_t, security_context_t));
> extern void set_secctx_in_proposal __P((struct ph2handle *, struct policyindex));
> #endif
>diff -urp ipsec-tools-0.6.5.orig/src/racoon/security.c ipsec-tools-0.6.5/src/racoon/security.c
>--- ipsec-tools-0.6.5.orig/src/racoon/security.c	2007-04-14 16:00:17.000000000 -0400
>+++ ipsec-tools-0.6.5/src/racoon/security.c	2007-04-14 16:50:53.000000000 -0400
>@@ -181,24 +181,21 @@ set_secctx_in_proposal(iph2, spidx)
>  * return:	0	if avc was successfully initialized
>  * 		1	if the avc could not be initialized
>  */
>-
>-static int
>+static int mls_ready = 0;
>+void
> init_avc(void)
> {
>-	int rtn = 0;
>-
> 	if (!is_selinux_mls_enabled()) {
> 		plog(LLV_ERROR, LOCATION, NULL, "racoon: MLS support is not"
> 				" enabled.\n");
>-		return 1;
>+		return;
> 	}
> 
>-	rtn = avc_init("racoon", NULL, NULL, NULL, NULL);
>-	if (rtn != 0) {
>-		plog(LLV_ERROR, LOCATION, NULL, "racoon: could not initialize avc.\n");
>-		rtn = 1;
>-	}
>-	return rtn;
>+	if (avc_init("racoon", NULL, NULL, NULL, NULL) == 0)
>+		mls_ready = 1;
>+	else
>+		plog(LLV_ERROR, LOCATION, NULL,
>+				"racoon: could not initialize avc.\n");
> }
> 
> /*
>@@ -225,12 +222,8 @@ within_range(security_context_t sl, secu
> 	if (!*range)	/* This policy doesn't have security context */
> 		return 1;
> 
>-	rtn = init_avc();
>-	if (rtn != 0) {
>-		plog(LLV_ERROR, LOCATION, NULL, 
>-			"within_range: couldn't initialize the AVC\n");
>+	if (!mls_ready) /* mls may not be enabled */
> 		return 0;
>-	}
> 
> 	/*
> 	 * Get the sids for the sl and range contexts

Actions: View | Diff

Attachments on bug 235680: 152625 | 152626 | 152627