lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

xen/blkback: potential null dereference in error handling

Browse Source 
blkbk->pending_pages can be NULL here so I added a check for it.

Signed-off-by: Dan Carpenter <error27@gmail.com>
[v1: Redid the loop a bit]
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
This commit is contained in:
Dan Carpenter
2011-05-27 09:27:16 +03:00
committed by Konrad Rzeszutek Wilk
parent 6464920a6e
commit 9b83c77121
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/block/xen-blkback/blkback.c
View File

@@ -809,11 +809,13 @@ static int __init xen_blkif_init(void)
failed_init: failed_init:
kfree(blkbk->pending_reqs); kfree(blkbk->pending_reqs);
kfree(blkbk->pending_grant_handles); kfree(blkbk->pending_grant_handles);
if (blkbk->pending_pages) {
for (i = 0; i < mmap_pages; i++) { for (i = 0; i < mmap_pages; i++) {
if (blkbk->pending_pages[i]) if (blkbk->pending_pages[i])
__free_page(blkbk->pending_pages[i]); __free_page(blkbk->pending_pages[i]);
} }
kfree(blkbk->pending_pages); kfree(blkbk->pending_pages);
}
kfree(blkbk); kfree(blkbk);
blkbk = NULL; blkbk = NULL;
return rc; return rc;