Attachment 152503 Details for Bug 235475 – patch for xfrm_send_acquire()

[patch] patch for xfrm_send_acquire()

patch.0412.3 (text/plain), 1.25 KB, created by Joy Latten on 2007-04-12 19:57:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Joy Latten

Created: 2007-04-12 19:57:40 UTC

Size: 1.25 KB

patch

obsolete

>diff -urpN linux-2.6.18.ppc64.orig/net/xfrm/xfrm_user.c linux-2.6.18.ppc64/net/xfrm/xfrm_user.c
>--- linux-2.6.18.ppc64.orig/net/xfrm/xfrm_user.c	2007-04-12 13:53:55.000000000 -0500
>+++ linux-2.6.18.ppc64/net/xfrm/xfrm_user.c	2007-04-12 13:59:50.000000000 -0500
>@@ -236,9 +236,8 @@ static int attach_encap_tmpl(struct xfrm
> }
> 
> 
>-static inline int xfrm_user_sec_ctx_size(struct xfrm_policy *xp)
>+static inline int xfrm_user_sec_ctx_size(struct xfrm_sec_ctx *xfrm_ctx)
> {
>-	struct xfrm_sec_ctx *xfrm_ctx = xp->security;
> 	int len = 0;
> 
> 	if (xfrm_ctx) {
>@@ -1772,7 +1771,7 @@ static int xfrm_send_acquire(struct xfrm
> 
> 	len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
> 	len += NLMSG_SPACE(sizeof(struct xfrm_user_acquire));
>-	len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
>+	len += RTA_SPACE(xfrm_user_sec_ctx_size(x->security));
> 	skb = alloc_skb(len, GFP_ATOMIC);
> 	if (skb == NULL)
> 		return -ENOMEM;
>@@ -1876,7 +1875,7 @@ static int xfrm_exp_policy_notify(struct
> 
> 	len = RTA_SPACE(sizeof(struct xfrm_user_tmpl) * xp->xfrm_nr);
> 	len += NLMSG_SPACE(sizeof(struct xfrm_user_polexpire));
>-	len += RTA_SPACE(xfrm_user_sec_ctx_size(xp));
>+	len += RTA_SPACE(xfrm_user_sec_ctx_size(xp->security));
> 	skb = alloc_skb(len, GFP_ATOMIC);
> 	if (skb == NULL)
> 		return -ENOMEM;

Actions: View | Diff

Attachments on bug 235475: 151821 | 151825 | 151880 | 152078 | 152084 | 152194 | 152196 | 152289 | 152320 | 152503 | 152618