The patch 'e22dea67d2f7 ("NFS: Fix memory leaks and corruption in readdir")' in 4.4.y/4.9.y will introduce a highmem leak. Actually, nfs_readdir_get_array has did what we want to do. No need to call kmap again.
Signed-off-by: yangerkun yangerkun@huawei.com --- fs/nfs/dir.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c2665d920cf8..2517fcd423b6 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -678,8 +678,6 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, goto out_label_free; }
- array = kmap(page); - status = nfs_readdir_alloc_pages(pages, array_size); if (status < 0) goto out_release_array;
On Tue, Mar 10, 2020 at 06:02:19PM +0800, yangerkun wrote:
The patch 'e22dea67d2f7 ("NFS: Fix memory leaks and corruption in readdir")' in 4.4.y/4.9.y will introduce a highmem leak. Actually, nfs_readdir_get_array has did what we want to do. No need to call kmap again.
Signed-off-by: yangerkun yangerkun@huawei.com
fs/nfs/dir.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c2665d920cf8..2517fcd423b6 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -678,8 +678,6 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, goto out_label_free; }
- array = kmap(page);
- status = nfs_readdir_alloc_pages(pages, array_size); if (status < 0) goto out_release_array;
-- 2.17.2
Can you resend and cc: the NFS developers and maintainers on this change? I need their ack to be able to apply it.
thanks,
greg k-h
On 2020/3/10 19:37, Greg KH wrote:
On Tue, Mar 10, 2020 at 06:02:19PM +0800, yangerkun wrote:
The patch 'e22dea67d2f7 ("NFS: Fix memory leaks and corruption in readdir")' in 4.4.y/4.9.y will introduce a highmem leak. Actually, nfs_readdir_get_array has did what we want to do. No need to call kmap again.
Signed-off-by: yangerkun yangerkun@huawei.com
fs/nfs/dir.c | 2 -- 1 file changed, 2 deletions(-)
diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c index c2665d920cf8..2517fcd423b6 100644 --- a/fs/nfs/dir.c +++ b/fs/nfs/dir.c @@ -678,8 +678,6 @@ int nfs_readdir_xdr_to_array(nfs_readdir_descriptor_t *desc, struct page *page, goto out_label_free; }
- array = kmap(page);
- status = nfs_readdir_alloc_pages(pages, array_size); if (status < 0) goto out_release_array;
-- 2.17.2
Can you resend and cc: the NFS developers and maintainers on this change? I need their ack to be able to apply it.
Okay, will do it right now.
Thanks, Kun.
thanks,
greg k-h
.
linux-stable-mirror@lists.linaro.org
-
Greg KH -
yangerkun