Received-SPF: pass (google.com: best guess record for domain of linux-ext4-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Jan Stancek <jstancek@redhat.com>
To:     darrick.wong@oracle.com, naresh.kamboju@linaro.org,
        hch@infradead.org
Cc:     ltp@lists.linux.it, linux-next@vger.kernel.org,
        linux-fsdevel@vger.kernel.org, chrubis@suse.cz,
        linux-kernel@vger.kernel.org, viro@zeniv.linux.org.uk,
        broonie@kernel.org, arnd@arndb.de, lkft-triage@lists.linaro.org,
        linux-ext4@vger.kernel.org, tytso@mit.edu, jstancek@redhat.com
Subject: [PATCH] iomap: fix return value of iomap_dio_bio_actor on 32bit systems
Date:   Mon, 11 Nov 2019 11:28:10 +0100
Message-Id: <b757ff64ddf68519fc3d55b66fcd8a1d4b436395.1573467154.git.jstancek@redhat.com>
In-Reply-To: <20191111083815.GA29540@infradead.org>
References: <20191111083815.GA29540@infradead.org>
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: quoted-printable
Sender: linux-ext4-owner@vger.kernel.org
Precedence: bulk

Naresh reported LTP diotest4 failing for 32bit x86 and arm -next
kernels on ext4. Same problem exists in 5.4-rc7 on xfs.

The failure comes down to:
  openat(AT_FDCWD, "testdata-4.5918", O_RDWR|O_DIRECT) =3D 4
  mmap2(NULL, 4096, PROT_READ, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) =3D 0xb7f7=
b000
  read(4, 0xb7f7b000, 4096)              =3D 0 // expects -EFAULT

Problem is conversion at iomap_dio_bio_actor() return. Ternary
operator has a return type and an attempt is made to convert each
of operands to the type of the other. In this case "ret" (int)
is converted to type of "copied" (unsigned long). Both have size
of 4 bytes:
    size_t copied =3D 0;
    int ret =3D -14;
    long long actor_ret =3D copied ? copied : ret;

    On x86_64: actor_ret =3D=3D -14;
    On x86   : actor_ret =3D=3D 4294967282

Replace ternary operator with 2 return statements to avoid this
unwanted conversion.

Fixes: 4721a6010990 ("iomap: dio data corruption and spurious errors when p=
ipes fill")
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Signed-off-by: Jan Stancek <jstancek@redhat.com>
---
 fs/iomap/direct-io.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/fs/iomap/direct-io.c b/fs/iomap/direct-io.c
index 1fc28c2da279..7c58f51d7da7 100644
--- a/fs/iomap/direct-io.c
+++ b/fs/iomap/direct-io.c
@@ -318,7 +318,9 @@ static void iomap_dio_bio_end_io(struct bio *bio)
 =09=09if (pad)
 =09=09=09iomap_dio_zero(dio, iomap, pos, fs_block_size - pad);
 =09}
-=09return copied ? copied : ret;
+=09if (copied)
+=09=09return copied;
+=09return ret;
 }
=20
 static loff_t
--=20
1.8.3.1