]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
direct-io: Prevent NULL pointer access in submit_page_section
authorAndreas Gruenbacher <agruenba@redhat.com>
Mon, 9 Oct 2017 09:13:18 +0000 (11:13 +0200)
committerAl Viro <viro@zeniv.linux.org.uk>
Wed, 11 Oct 2017 03:10:02 +0000 (23:10 -0400)
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>
fs/direct-io.c

index 62cf812ed0e5803ac9148a9ea8a27f00efca7f2a..96415c65bbdc102f6a5dff696231e944d4fdccdb 100644 (file)
@@ -866,7 +866,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);
                put_page(sdio->cur_page);
                sdio->cur_page = NULL;
        }