diff options
| author | Andreas Gruenbacher <agruenba@redhat.com> | 2017-10-09 11:13:18 +0200 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2017-11-02 07:16:05 +0100 |
| commit | d75e8540fd8bedc8ee8d11941a7aed3a86735c47 (patch) | |
| tree | f70f4496a3071dacd9517f767fb189d432b1533b | |
| parent | 544d7ba2c8304b1db4a12a39225443f9f689985d (diff) | |
direct-io: Prevent NULL pointer access in submit_page_section
commit 899f0429c7d3eed886406cd72182bee3b96aa1f9 upstream.
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>
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 e17d919aa6d8..4007749a478e 100644 --- a/fs/direct-io.c +++ b/fs/direct-io.c @@ -759,7 +759,8 @@ out: */ if (sdio->boundary) { ret = dio_send_cur_page(dio, sdio, map_bh); - dio_bio_submit(dio, sdio); + if (sdio->bio) + dio_bio_submit(dio, sdio); page_cache_release(sdio->cur_page); sdio->cur_page = NULL; } |