: xfrm_algo_clone() allocates too much memory
Subsystems (3)
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()
include/net/xfrm.h | 7 ++++++- net/xfrm/xfrm_user.c | 5 ----- 2 files changed, 6 insertions(+), 6 deletions(-)
include/net/xfrm.h +6 -1
@@ -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)
net/xfrm/xfrm_user.c +0 -5
@@ -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];
Herbert Xu
maintainerinclude/net/xfrm.h static inline int xfrm_aevent_is_on(void) · line 1191
Quoted 10 lines · Eric Dumazet
include/net/xfrm.h +1
-0@@ -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,
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtQuoted 9 lines · Herbert Xu
Quoted 8 lines · Eric Dumazet
include/net/xfrm.h +0
-0@@ -1188,10 +1188,15 @@ static inline int xfrm_aevent_is_on(void)return ret; }
Quoted 3 lines
include/net/xfrm.h static inline int xfrm_aevent_is_on(void) · line 1191
Quoted 1 line
include/net/xfrm.h +1
-0+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.
include/net/xfrm.h | 7 ++++++- net/xfrm/xfrm_user.c | 17 ++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-)
include/net/xfrm.h +6 -1
@@ -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)
net/xfrm/xfrm_user.c +6 -11
@@ -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)
From: Eric Dumazet <[email protected]>
Date: Wed, 09 Jan 2008 08:29:11 +0100
Thanks for catching this.
Applied to net-2.6
include/net/xfrm.h static inline int xfrm_aevent_is_on(void) · line 1194
Quoted 4 lines
include/net/xfrm.h +4
-0+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 :-))))
Quoted 5 lines · David Miller
From: Eric Dumazet <[email protected]>
Date: Wed, 09 Jan 2008 08:29:11 +0100Thanks for catching this.
Quoted 10 lines
Applied to net-2.6
include/net/xfrm.h static inline int xfrm_aevent_is_on(void) · line 1194
Quoted 4 lines
include/net/xfrm.h +4
-0+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)
David Miller
maintainerFrom: Eric Dumazet <[email protected]>
Date: Wed, 09 Jan 2008 08:51:39 +0100
Quoted 2 lines
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.