[PATCH][stable-4.1/3.18] mm/swap.c: Fix a copy&paste error during backport

[PATCH][stable-4.1/3.18] mm/swap.c: Fix a copy&paste error during backport

[Huacai Chen]

When backport 8f182270dfec432e ("mm/swap.c: flush lru pvecs on compound
page arrival") to 4.1/3.18 stable branches, there is a copy&paste error
which will cause memory leak and then an OOM.

Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
 mm/swap.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mm/swap.c b/mm/swap.c
index b523f0a..ab3b9c2 100644
--- a/mm/swap.c
+++ b/mm/swap.c
@@ -631,7 +631,7 @@ static void __lru_cache_add(struct page *page)
 	struct pagevec *pvec = &get_cpu_var(lru_add_pvec);
 
 	page_cache_get(page);
-	if (!pagevec_space(pvec) || PageCompound(page))
+	if (!pagevec_add(pvec, page) || PageCompound(page))
 		__pagevec_lru_add(pvec);
 	put_cpu_var(lru_add_pvec);
 }
-- 
2.7.0

Re: [PATCH][stable-4.1/3.18] mm/swap.c: Fix a copy&paste error during backport

[Greg Kroah-Hartman]

On Sat, Jul 23, 2016 at 05:30:47PM +0800, Huacai Chen wrote:
> When backport 8f182270dfec432e ("mm/swap.c: flush lru pvecs on compound
> page arrival") to 4.1/3.18 stable branches, there is a copy&paste error
> which will cause memory leak and then an OOM.
> 
> Signed-off-by: Huacai Chen <chenhc@lemote.com>
> ---
>  mm/swap.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

I am not the maintainer of these kernels, it is Sasha, so there's not
much I can do here, sorry.

greg k-h

Re: [PATCH][stable-4.1/3.18] mm/swap.c: Fix a copy&paste error during backport

[Sebastian Gottschall]

Am 23.07.2016 um 18:42 schrieb Greg Kroah-Hartman:
> On Sat, Jul 23, 2016 at 05:30:47PM +0800, Huacai Chen wrote:
>> When backport 8f182270dfec432e ("mm/swap.c: flush lru pvecs on compound
>> page arrival") to 4.1/3.18 stable branches, there is a copy&paste error
>> which will cause memory leak and then an OOM.
>>
>> Signed-off-by: Huacai Chen <chenhc@lemote.com>
>> ---
>>   mm/swap.c | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
> I am not the maintainer of these kernels, it is Sasha, so there's not
> much I can do here, sorry.
>
> greg k-h
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
consider that sasha is not on this list anymore. his email address is 
invalid. i dont think that he got notice of it and its a bad situation 
if stable kernels are broken. (since more than a week)

Sebastian


-- 
Mit freundlichen Gr�ssen / Regards

Sebastian Gottschall / CTO

NewMedia-NET GmbH - DD-WRT
Firmensitz:  Berliner Ring 101, 64625 Bensheim
Registergericht: Amtsgericht Darmstadt, HRB 25473
Gesch�ftsf�hrer: Peter Steinh�user, Christian Scheele
http://www.dd-wrt.com
email: s.gottschall@dd-wrt.com
Tel.: +496251-582650 / Fax: +496251-5826565

Re: [PATCH][stable-4.1/3.18] mm/swap.c: Fix a copy&paste error during backport

[Greg Kroah-Hartman]

On Sun, Jul 24, 2016 at 03:30:38PM +0200, Sebastian Gottschall wrote:
> Am 23.07.2016 um 18:42 schrieb Greg Kroah-Hartman:
> > On Sat, Jul 23, 2016 at 05:30:47PM +0800, Huacai Chen wrote:
> > > When backport 8f182270dfec432e ("mm/swap.c: flush lru pvecs on compound
> > > page arrival") to 4.1/3.18 stable branches, there is a copy&paste error
> > > which will cause memory leak and then an OOM.
> > > 
> > > Signed-off-by: Huacai Chen <chenhc@lemote.com>
> > > ---
> > >   mm/swap.c | 2 +-
> > >   1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > I am not the maintainer of these kernels, it is Sasha, so there's not
> > much I can do here, sorry.
>
> consider that sasha is not on this list anymore. his email address is
> invalid. i dont think that he got notice of it and its a bad situation if
> stable kernels are broken. (since more than a week)

I trust he will return, give him a chance :)

In the meantime, just apply the patch as needed to your local copies of
the tree, or upgrade to a newer release.

thanks,

greg k-h