OSDN Git Service

f2fs: fix ERR_PTR returned by bio
authorJaegeuk Kim <jaegeuk@kernel.org>
Tue, 12 Jul 2016 16:38:48 +0000 (09:38 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Fri, 15 Jul 2016 22:21:19 +0000 (15:21 -0700)
This is to fix wrong error pointer handling flow reported by Dan.

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Chao Yu <chao@kernel.org>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/data.c

index 20b3016..6500995 100644 (file)
@@ -1085,8 +1085,10 @@ submit_and_realloc:
                }
                if (bio == NULL) {
                        bio = f2fs_grab_bio(inode, block_nr, nr_pages);
-                       if (IS_ERR(bio))
+                       if (IS_ERR(bio)) {
+                               bio = NULL;
                                goto set_error_page;
+                       }
                }
 
                if (bio_add_page(bio, page, blocksize, 0) < blocksize)