]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
mm/memory-failure: cast index to loff_t before shifting it
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Mon, 18 Dec 2023 13:58:37 +0000 (13:58 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 5 Jan 2024 14:18:39 +0000 (15:18 +0100)
commit 39ebd6dce62d8cfe3864e16148927a139f11bc9a upstream.

On 32-bit systems, we'll lose the top bits of index because arithmetic
will be performed in unsigned long instead of unsigned long long.  This
affects files over 4GB in size.

Link: https://lkml.kernel.org/r/20231218135837.3310403-4-willy@infradead.org
Fixes: 6100e34b2526 ("mm, memory_failure: Teach memory_failure() about dev_pagemap pages")
Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mm/memory-failure.c

index 99de0328d1bedb6101054dcd8d92a972f544e058..c45b8c64cdcdde22045203aad6c7e74802213f07 100644 (file)
@@ -1560,7 +1560,7 @@ static void unmap_and_kill(struct list_head *to_kill, unsigned long pfn,
                 * mapping being torn down is communicated in siginfo, see
                 * kill_proc()
                 */
-               loff_t start = (index << PAGE_SHIFT) & ~(size - 1);
+               loff_t start = ((loff_t)index << PAGE_SHIFT) & ~(size - 1);
 
                unmap_mapping_range(mapping, start, size, 0);
        }