Attachment 150444 Details for Bug 232508 – Patch to fix racoon segfault between 32bit and 64bit machines.

[patch] Patch to fix racoon segfault between 32bit and 64bit machines.

patch.0315 (text/plain), 1.28 KB, created by Joy Latten on 2007-03-19 23:39:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joy Latten

Created: 2007-03-19 23:39:10 UTC

Size: 1.28 KB

patch

obsolete

>diff -urpN ipsec-tools-0.6.5.orig/src/racoon/ipsec_doi.c ipsec-tools-0.6.5.patch/src/racoon/ipsec_doi.c
>--- ipsec-tools-0.6.5.orig/src/racoon/ipsec_doi.c	2007-03-15 14:10:01.000000000 -0500
>+++ ipsec-tools-0.6.5.patch/src/racoon/ipsec_doi.c	2007-03-15 14:19:43.000000000 -0500
>@@ -3063,8 +3063,11 @@ setph2proposal0(iph2, pp, pr)
> 
> #ifdef HAVE_SECCTX
> 		if (*pp->sctx.ctx_str) {
>+			struct security_ctx secctx;
>+			secctx = pp->sctx;
>+			secctx.ctx_strlen = htons(pp->sctx.ctx_strlen);
> 			x = isakmp_set_attr_v(x, IPSECDOI_ATTR_SECCTX,
>-					      (caddr_t)&pp->sctx, truectxlen);
>+					      (caddr_t)&secctx, truectxlen);
> 		}
> #endif
> 
>@@ -4189,6 +4192,7 @@ ipsecdoi_t2satrns(t, pp, pr, tr)
> 		{
> 			int len = ntohs(d->lorv);
> 			memcpy(&pp->sctx, d + 1, len);
>+			pp->sctx.ctx_strlen = ntohs(pp->sctx.ctx_strlen);
> 			break;
> 		}
> #endif
>diff -urpN ipsec-tools-0.6.5.orig/src/racoon/security.c ipsec-tools-0.6.5.patch/src/racoon/security.c
>--- ipsec-tools-0.6.5.orig/src/racoon/security.c	2007-03-15 14:10:01.000000000 -0500
>+++ ipsec-tools-0.6.5.patch/src/racoon/security.c	2007-03-15 14:19:31.000000000 -0500
>@@ -153,6 +153,7 @@ get_security_context(sa, p)
> 				return -1;
> 			}
> 			memcpy(&p->sec_ctx, d + 1, lorv);
>+			p->sec_ctx.ctx_strlen = ntohs(p->sec_ctx.ctx_strlen);
> 			return 0;
> 		}
> 	}

Actions: View | Diff

Attachments on bug 232508: 150444