浏览代码

FS/NFS: replace count*size kzalloc by kcalloc

kcalloc manages count*sizeof overflow.

Cc: Trond Myklebust <trond.myklebust@primarydata.com>
Cc: linux-nfs@vger.kernel.org
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Fabian Frederick 11 年之前
父节点
当前提交
f15b504144
共有 2 个文件被更改,包括 2 次插入2 次删除
  1. 1 1
      fs/nfs/blocklayout/blocklayout.c
  2. 1 1
      fs/nfs/filelayout/filelayoutdev.c

+ 1 - 1
fs/nfs/blocklayout/blocklayout.c

@@ -1062,7 +1062,7 @@ nfs4_blk_get_deviceinfo(struct nfs_server *server, const struct nfs_fh *fh,
 		return ERR_PTR(-ENOMEM);
 		return ERR_PTR(-ENOMEM);
 	}
 	}
 
 
-	pages = kzalloc(max_pages * sizeof(struct page *), GFP_NOFS);
+	pages = kcalloc(max_pages, sizeof(struct page *), GFP_NOFS);
 	if (pages == NULL) {
 	if (pages == NULL) {
 		kfree(dev);
 		kfree(dev);
 		return ERR_PTR(-ENOMEM);
 		return ERR_PTR(-ENOMEM);

+ 1 - 1
fs/nfs/filelayout/filelayoutdev.c

@@ -695,7 +695,7 @@ filelayout_get_device_info(struct inode *inode,
 	if (pdev == NULL)
 	if (pdev == NULL)
 		return NULL;
 		return NULL;
 
 
-	pages = kzalloc(max_pages * sizeof(struct page *), gfp_flags);
+	pages = kcalloc(max_pages, sizeof(struct page *), gfp_flags);
 	if (pages == NULL) {
 	if (pages == NULL) {
 		kfree(pdev);
 		kfree(pdev);
 		return NULL;
 		return NULL;