From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1751923AbdKBGSV (ORCPT <rfc822;w@1wt.eu>);
        Thu, 2 Nov 2017 02:18:21 -0400
Received: from wtarreau.pck.nerim.net ([62.212.114.60]:35579 "EHLO 1wt.eu"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S1750907AbdKBGST (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
        Thu, 2 Nov 2017 02:18:19 -0400
Date: Thu, 2 Nov 2017 07:17:29 +0100
From: Willy Tarreau <w@1wt.eu>
To: Andreas Gruenbacher <agruenba@redhat.com>
Cc: LKML <linux-kernel@vger.kernel.org>, stable <stable@vger.kernel.org>,
        linux@roeck-us.net, Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: [PATCH 3.10 054/139] direct-io: Prevent NULL pointer access in
 submit_page_section
Message-ID: <20171102061729.GD5678@1wt.eu>
References: <1509571159-4405-1-git-send-email-w@1wt.eu>
 <1509571600-4858-1-git-send-email-w@1wt.eu>
 <1509571600-4858-5-git-send-email-w@1wt.eu>
 <CAHc6FU4KcLYcnKhpw2ZUUvp2-L0a2utW_-UaynoXudLf3LOP5Q@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CAHc6FU4KcLYcnKhpw2ZUUvp2-L0a2utW_-UaynoXudLf3LOP5Q@mail.gmail.com>
User-Agent: Mutt/1.6.1 (2016-04-27)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Hi Andreas,

On Wed, Nov 01, 2017 at 11:43:26PM +0100, Andreas Gruenbacher wrote:
> > diff --git a/fs/direct-io.c b/fs/direct-io.c
> > index e17d919..85485c1 100644
> > --- a/fs/direct-io.c
> > +++ b/fs/direct-io.c
> > @@ -760,6 +760,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;
> >         }
> 
> this is incorrect; please compare with the upstream commit.

Oh crap, sorry! I had to fix it by hand and I messed up fixing
the conflict! I've just dropped the first dio_bio_submit() so
that only the conditional one remains now.

Thanks for reporting it!
Willy

---

commit d75e8540fd8bedc8ee8d11941a7aed3a86735c47
Author: Andreas Gruenbacher <agruenba@redhat.com>
Date:   Mon Oct 9 11:13:18 2017 +0200

    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>

diff --git a/fs/direct-io.c b/fs/direct-io.c
index e17d919..4007749 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;
 	}