direct-io: Prevent NULL pointer access in submit_page_section
PATCH 1/1 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.
--- fs/direct-io.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/direct-io.c +2 -1
@@ -838,7 +838,8 @@ submit_page_section(struct dio *dio, struct dio_submit *sdio, struct page *page,*/ 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 ; }
Signature · 1 line
2.13.5
Al Viro
maintainerQuoted 9 lines · Andreas Gruenbacher
In the code added to function
submit_page_sectionby commitb1058b981,sdio->biocan currently be NULL when callingdio_bio_submit. This then leads to a NULL pointer access indio_bio_submit, so check for a NULL bio insubmit_page_sectionbefore trying to submit it instead.Fixes xfstest generic/250 on gfs2.
Signed-off-by Andreas Gruenbacher <[email protected]>Reviewed-by Jan Kara <[email protected]>
How far back in -stable should it go? I'm fine with the patch, but I'd rather have accurate Cc: stable in commit message...
Quoted 6 lines · Al Viro
Quoted 5 lines · Andreas Gruenbacher
In the code added to function
submit_page_sectionby commitb1058b981,sdio->biocan currently be NULL when callingdio_bio_submit. This then leads to a NULL pointer access indio_bio_submit, so check for a NULL bio insubmit_page_sectionbefore trying to submit it instead.
Quoted 7 lines
Quoted 4 lines
Fixes xfstest generic/250 on gfs2.
Signed-off-by Andreas Gruenbacher <[email protected]>Reviewed-by Jan Kara <[email protected]>How far back in -stable should it go? I'm fine with the patch, but I'd rather have accurate Cc: stable in commit message...
The bug was introduced in 3.10, and apart from a trivial conflict with:
09cbfeaf1a5a mm, fs: get rid of PAGE_CACHE_* and
page_cache_{get,release} macros
from v4.6, it applies up to v3.10.
The conflict is in the diff context: page_cache_release has been replaced by put_page.
Thanks,
Andreas