diff options
author | Andreas Gruenbacher <agruenba@redhat.com> | 2017-10-09 05:13:18 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-10-10 23:10:02 -0400 |
commit | 899f0429c7d3eed886406cd72182bee3b96aa1f9 (patch) | |
tree | 9788036e0f8aa463f6feca6dd8d8a06eeaf8728b | |
parent | 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f (diff) |
direct-io: Prevent NULL pointer access in submit_page_section
In the code added to function submit_page_section by commit b1058b981,
sdio->bio can currently be NULL when calling dio_bio_submit. This then
leads to a NULL pointer access in dio_bio_submit, so check for a NULL
bio in submit_page_section before trying to submit it instead.
Fixes xfstest generic/250 on gfs2.
Cc: stable@vger.kernel.org # v3.10+
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r-- | fs/direct-io.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/direct-io.c b/fs/direct-io.c index 62cf812ed0e5..96415c65bbdc 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c | |||
@@ -866,7 +866,8 @@ out: | |||
866 | */ | 866 | */ |
867 | if (sdio->boundary) { | 867 | if (sdio->boundary) { |
868 | ret = dio_send_cur_page(dio, sdio, map_bh); | 868 | ret = dio_send_cur_page(dio, sdio, map_bh); |
869 | dio_bio_submit(dio, sdio); | 869 | if (sdio->bio) |
870 | dio_bio_submit(dio, sdio); | ||
870 | put_page(sdio->cur_page); | 871 | put_page(sdio->cur_page); |
871 | sdio->cur_page = NULL; | 872 | sdio->cur_page = NULL; |
872 | } | 873 | } |