From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Sep 2021 14:53:53 +0000 (-0700)
Subject: Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt
X-Git-Tag: v5.15-rc4~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fd3ec5c7af58d5d6b598fba22ac387645af33f4;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt

Pull fsverity fix from Eric Biggers:
 "Fix an integer overflow when computing the Merkle tree layout of
  extremely large files, exposed by btrfs adding support for fs-verity"

* tag 'fsverity-for-linus' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt:
  fs-verity: fix signed integer overflow with i_size near S64_MAX
---

6fd3ec5c7af58d5d6b598fba22ac387645af33f4