* [XFRM]: xfrm_algo_clone() allocates too much memory @ 2008-01-08 18:37 Eric Dumazet 2008-01-09 6:15 ` Herbert Xu 0 siblings, 1 reply; 6+ messages in thread From: Eric Dumazet @ 2008-01-08 18:37 UTC (permalink / raw) To: David S. Miller; +Cc: Linux Netdev List [-- Attachment #1: Type: text/plain, Size: 378 bytes --] alg_key_len is the length in bits of the key, not in bytes. Best way to fix this is to move alg_len() function from net/xfrm/xfrm_user.c to include/net/xfrm.h, and to use it in xfrm_algo_clone() Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> include/net/xfrm.h | 7 ++++++- net/xfrm/xfrm_user.c | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-) [-- Attachment #2: xfrm_algo_clone.patch --] [-- Type: text/plain, Size: 1074 bytes --] diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 58dfa82..731f0a8 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1188,10 +1188,15 @@ static inline int xfrm_aevent_is_on(void) return ret; } +static inline int alg_len(struct xfrm_algo *alg) +{ + return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); +} + #ifdef CONFIG_XFRM_MIGRATE static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig) { - return (struct xfrm_algo *)kmemdup(orig, sizeof(*orig) + orig->alg_key_len, GFP_KERNEL); + return kmemdup(orig, alg_len(orig), GFP_KERNEL); } static inline void xfrm_states_put(struct xfrm_state **states, int n) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index e75dbdc..aa667a4 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -31,11 +31,6 @@ #include <linux/in6.h> #endif -static inline int alg_len(struct xfrm_algo *alg) -{ - return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); -} - static int verify_one_alg(struct nlattr **attrs, enum xfrm_attr_type_t type) { struct nlattr *rt = attrs[type]; ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [XFRM]: xfrm_algo_clone() allocates too much memory 2008-01-08 18:37 [XFRM]: xfrm_algo_clone() allocates too much memory Eric Dumazet @ 2008-01-09 6:15 ` Herbert Xu 2008-01-09 7:29 ` Eric Dumazet 0 siblings, 1 reply; 6+ messages in thread From: Herbert Xu @ 2008-01-09 6:15 UTC (permalink / raw) To: Eric Dumazet; +Cc: davem, netdev Eric Dumazet <dada1@cosmosbay.com> wrote: > > diff --git a/include/net/xfrm.h b/include/net/xfrm.h > index 58dfa82..731f0a8 100644 > --- a/include/net/xfrm.h > +++ b/include/net/xfrm.h > @@ -1188,10 +1188,15 @@ static inline int xfrm_aevent_is_on(void) > return ret; > } > > +static inline int alg_len(struct xfrm_algo *alg) Could you please add an xfrm prefix to this? Thanks, -- Visit Openswan at http://www.openswan.org/ Email: Herbert Xu ~{PmV>HI~} <herbert@gondor.apana.org.au> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [XFRM]: xfrm_algo_clone() allocates too much memory 2008-01-09 6:15 ` Herbert Xu @ 2008-01-09 7:29 ` Eric Dumazet 2008-01-09 7:40 ` David Miller 0 siblings, 1 reply; 6+ messages in thread From: Eric Dumazet @ 2008-01-09 7:29 UTC (permalink / raw) To: Herbert Xu; +Cc: davem, netdev [-- Attachment #1: Type: text/plain, Size: 1020 bytes --] Herbert Xu a écrit : > Eric Dumazet <dada1@cosmosbay.com> wrote: >> diff --git a/include/net/xfrm.h b/include/net/xfrm.h >> index 58dfa82..731f0a8 100644 >> --- a/include/net/xfrm.h >> +++ b/include/net/xfrm.h >> @@ -1188,10 +1188,15 @@ static inline int xfrm_aevent_is_on(void) >> return ret; >> } >> >> +static inline int alg_len(struct xfrm_algo *alg) > > Could you please add an xfrm prefix to this? Sure, thanks for the suggestion :) [XFRM]: xfrm_algo_clone() allocates too much memory alg_key_len is the length in bits of the key, not in bytes. Best way to fix this is to move alg_len() function from net/xfrm/xfrm_user.c to include/net/xfrm.h, and to use it in xfrm_algo_clone() alg_len() is renamed to xfrm_alg_len() because of its global exposition. Signed-off-by: Eric Dumazet <dada1@cosmosbay.com> Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au> include/net/xfrm.h | 7 ++++++- net/xfrm/xfrm_user.c | 17 ++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) [-- Attachment #2: xfrm_algo_clone.patch --] [-- Type: text/plain, Size: 2471 bytes --] diff --git a/include/net/xfrm.h b/include/net/xfrm.h index 58dfa82..1dd20cf 100644 --- a/include/net/xfrm.h +++ b/include/net/xfrm.h @@ -1188,10 +1188,15 @@ static inline int xfrm_aevent_is_on(void) return ret; } +static inline int xfrm_alg_len(struct xfrm_algo *alg) +{ + return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); +} + #ifdef CONFIG_XFRM_MIGRATE static inline struct xfrm_algo *xfrm_algo_clone(struct xfrm_algo *orig) { - return (struct xfrm_algo *)kmemdup(orig, sizeof(*orig) + orig->alg_key_len, GFP_KERNEL); + return kmemdup(orig, xfrm_alg_len(orig), GFP_KERNEL); } static inline void xfrm_states_put(struct xfrm_state **states, int n) diff --git a/net/xfrm/xfrm_user.c b/net/xfrm/xfrm_user.c index e75dbdc..c4f6419 100644 --- a/net/xfrm/xfrm_user.c +++ b/net/xfrm/xfrm_user.c @@ -31,11 +31,6 @@ #include <linux/in6.h> #endif -static inline int alg_len(struct xfrm_algo *alg) -{ - return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); -} - static int verify_one_alg(struct nlattr **attrs, enum xfrm_attr_type_t type) { struct nlattr *rt = attrs[type]; @@ -45,7 +40,7 @@ static int verify_one_alg(struct nlattr **attrs, enum xfrm_attr_type_t type) return 0; algp = nla_data(rt); - if (nla_len(rt) < alg_len(algp)) + if (nla_len(rt) < xfrm_alg_len(algp)) return -EINVAL; switch (type) { @@ -204,7 +199,7 @@ static int attach_one_algo(struct xfrm_algo **algpp, u8 *props, return -ENOSYS; *props = algo->desc.sadb_alg_id; - p = kmemdup(ualg, alg_len(ualg), GFP_KERNEL); + p = kmemdup(ualg, xfrm_alg_len(ualg), GFP_KERNEL); if (!p) return -ENOMEM; @@ -516,9 +511,9 @@ static int copy_to_user_state_extra(struct xfrm_state *x, NLA_PUT_U64(skb, XFRMA_LASTUSED, x->lastused); if (x->aalg) - NLA_PUT(skb, XFRMA_ALG_AUTH, alg_len(x->aalg), x->aalg); + NLA_PUT(skb, XFRMA_ALG_AUTH, xfrm_alg_len(x->aalg), x->aalg); if (x->ealg) - NLA_PUT(skb, XFRMA_ALG_CRYPT, alg_len(x->ealg), x->ealg); + NLA_PUT(skb, XFRMA_ALG_CRYPT, xfrm_alg_len(x->ealg), x->ealg); if (x->calg) NLA_PUT(skb, XFRMA_ALG_COMP, sizeof(*(x->calg)), x->calg); @@ -1978,9 +1973,9 @@ static inline size_t xfrm_sa_len(struct xfrm_state *x) { size_t l = 0; if (x->aalg) - l += nla_total_size(alg_len(x->aalg)); + l += nla_total_size(xfrm_alg_len(x->aalg)); if (x->ealg) - l += nla_total_size(alg_len(x->ealg)); + l += nla_total_size(xfrm_alg_len(x->ealg)); if (x->calg) l += nla_total_size(sizeof(*x->calg)); if (x->encap) ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [XFRM]: xfrm_algo_clone() allocates too much memory 2008-01-09 7:29 ` Eric Dumazet @ 2008-01-09 7:40 ` David Miller 2008-01-09 7:51 ` Eric Dumazet 0 siblings, 1 reply; 6+ messages in thread From: David Miller @ 2008-01-09 7:40 UTC (permalink / raw) To: dada1; +Cc: herbert, netdev From: Eric Dumazet <dada1@cosmosbay.com> Date: Wed, 09 Jan 2008 08:29:11 +0100 Thanks for catching this. Applied to net-2.6 > +static inline int xfrm_alg_len(struct xfrm_algo *alg) > +{ > + return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); > +} That gets emitted as a divide doesn't it :-)))) ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [XFRM]: xfrm_algo_clone() allocates too much memory 2008-01-09 7:40 ` David Miller @ 2008-01-09 7:51 ` Eric Dumazet 2008-01-09 7:53 ` David Miller 0 siblings, 1 reply; 6+ messages in thread From: Eric Dumazet @ 2008-01-09 7:51 UTC (permalink / raw) To: David Miller; +Cc: herbert, netdev David Miller a écrit : > From: Eric Dumazet <dada1@cosmosbay.com> > Date: Wed, 09 Jan 2008 08:29:11 +0100 > > Thanks for catching this. > > Applied to net-2.6 > >> +static inline int xfrm_alg_len(struct xfrm_algo *alg) >> +{ >> + return sizeof(*alg) + ((alg->alg_key_len + 7) / 8); >> +} > > That gets emitted as a divide doesn't it :-)))) > > Yes I have a patch for these divides, but will apply on 2.6.25 once this one hits it. (this saves 192 bytes of kernel text BTW) ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [XFRM]: xfrm_algo_clone() allocates too much memory 2008-01-09 7:51 ` Eric Dumazet @ 2008-01-09 7:53 ` David Miller 0 siblings, 0 replies; 6+ messages in thread From: David Miller @ 2008-01-09 7:53 UTC (permalink / raw) To: dada1; +Cc: herbert, netdev From: Eric Dumazet <dada1@cosmosbay.com> Date: Wed, 09 Jan 2008 08:51:39 +0100 > Yes I have a patch for these divides, but will apply on 2.6.25 once this one > hits it. (this saves 192 bytes of kernel text BTW) I never doubted you for a second. ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-01-09 7:53 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2008-01-08 18:37 [XFRM]: xfrm_algo_clone() allocates too much memory Eric Dumazet 2008-01-09 6:15 ` Herbert Xu 2008-01-09 7:29 ` Eric Dumazet 2008-01-09 7:40 ` David Miller 2008-01-09 7:51 ` Eric Dumazet 2008-01-09 7:53 ` David Miller
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).