[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <Line.LNX.4.64.0704131351080.20794@d.namei>
Date: Fri, 13 Apr 2007 13:51:24 -0400 (EDT)
From: James Morris <jmorris@...ei.org>
To: Joy Latten <latten@...tin.ibm.com>
cc: netdev@...r.kernel.org, davem@...emloft.net
Subject: Re: PATCH[1/1]: kernel panic when large security contexts in ACQUIRE
On Fri, 13 Apr 2007, Joy Latten wrote:
>
> Signed-off-by: Joy Latten <latten@...tin.ibm.com>
Acked-by: James Morris <jmorris@...ei.org>
>
>
> diff -urpN linux-2.6.20/net/xfrm/xfrm_user.c linux-2.6.20.patch/net/xfrm/xfrm_user.c
> --- linux-2.6.20/net/xfrm/xfrm_user.c 2007-04-12 15:12:27.000000000 -0500
> +++ linux-2.6.20.patch/net/xfrm/xfrm_user.c 2007-04-13 09:32:35.000000000 -0500
> @@ -272,9 +272,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) {
> @@ -2170,7 +2169,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));
> #ifdef CONFIG_XFRM_SUB_POLICY
> len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
> #endif
> @@ -2280,7 +2279,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));
> #ifdef CONFIG_XFRM_SUB_POLICY
> len += RTA_SPACE(sizeof(struct xfrm_userpolicy_type));
> #endif
>
--
James Morris
<jmorris@...ei.org>
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists