On Mon, Dec 06, 2010 at 04:30:57PM -0800, Greg KH wrote:
> On Sun, Oct 24, 2010 at 09:19:27PM -0600, dann frazier wrote:
> > hey Greg,
> >  These look like candidates for stable. The first applied cleanly to
> > our 2.6.32-based kernel; the second needed some offset
> > adjustments. I'll attach our adjusted version in case it helps.
> > 
> > commit 1c40be12f7d8ca1d387510d39787b12e512a7ce8
> > Author: Eric Dumazet <[email protected]>
> > Date:   Mon Aug 16 20:04:22 2010 +0000
> > 
> >     net sched: fix some kernel memory leaks
> >     
> >     We leak at least 32bits of kernel memory to user land in tc dump,
> >     because we dont init all fields (capab ?) of the dumped structure.
> >     
> >     Use C99 initializers so that holes and non explicit fields are zeroed.
> >     
> >     Signed-off-by: Eric Dumazet <[email protected]>
> >     Signed-off-by: David S. Miller <[email protected]>
> 
> This one doesn't apply to the .32-stable tree, care to provide a
> backport for it?

Right - you should pull this one in first, then both should cherry-pick
cleanly. This is what I did for the Debian tree. Alternatively, you
could drop the act_nat.c portion of 1c40be1 since the tc_nat struct was
kzalloc'd back then.

commit 504f85c9d05f7c605306e808f0d835fe11bfd18d
Author: Changli Gao <[email protected]>
Date:   Tue Jun 29 23:07:09 2010 +0000

    act_nat: use stack variable
    
    act_nat: use stack variable
    
    structure tc_nat isn't too big for stack, so we can put it in stack.
    
    Signed-off-by: Changli Gao <[email protected]>
    ----
     net/sched/act_nat.c |   31 ++++++++++---------------------
     1 file changed, 10 insertions(+), 21 deletions(-)
    Signed-off-by: David S. Miller <[email protected]>

_______________________________________________
stable mailing list
[email protected]
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to