From patchwork Fri Aug 26 15:08:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Potapenko X-Patchwork-Id: 12956216 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id DBD31ECAAA3 for ; Fri, 26 Aug 2022 15:10:15 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7C17F940017; Fri, 26 Aug 2022 11:10:15 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 74954940007; Fri, 26 Aug 2022 11:10:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5758F940017; Fri, 26 Aug 2022 11:10:15 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 41454940007 for ; Fri, 26 Aug 2022 11:10:15 -0400 (EDT) Received: from smtpin30.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 13B46C06B3 for ; Fri, 26 Aug 2022 15:10:15 +0000 (UTC) X-FDA: 79842079590.30.AB66D36 Received: from mail-lj1-f201.google.com (mail-lj1-f201.google.com [209.85.208.201]) by imf23.hostedemail.com (Postfix) with ESMTP id B5BB514000E for ; Fri, 26 Aug 2022 15:10:14 +0000 (UTC) Received: by mail-lj1-f201.google.com with SMTP id e1-20020a2e9841000000b002602ebb584fso662014ljj.14 for ; Fri, 26 Aug 2022 08:10:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc; bh=dGjdyFKcPZ8AZlzw9ep1EXgYBHGgW0m7GguSz7kBI6Q=; b=DZGsI9l3W9MQLA+ou9XdSB4IZE46ComuEd6rS14iWZ0xSDfAJ+BWwB8A7M05fO5zjT Wh7mYAH6WAAzh+FI/uVm5Ljcf9NEeu2Z9UZM+4qfZzFoj+6Fh/tecr4Yol7TBl6MiU/L tCTqBg9m2iJte3DzNqf8V7ws94Br5Wtp68vVWk7plrk6xmxEjPcPZVSvIrk/LnFF/INL 93xvlWF5Ha1xHXpbxLntxctwzalog3vxzBxrVMuGDkqbsYK5RzyESy+/nuRwFZ41sSYu t2owLKhR+yzd+pCanHFbrVCWUmN1zsn8mhRcH/6ROVVHuRMuA9Jhn32qCWbGf06hi10p XV8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc; bh=dGjdyFKcPZ8AZlzw9ep1EXgYBHGgW0m7GguSz7kBI6Q=; b=HhXRga5lz3AepNN9jGlYlEE9huIVzfdVlHlpghfTrkhTPmMnxog8FHBrm60AsIQ0nV r/Sk483wsQYSX9bhjcUUMx5+JW3ILUMlZfNyjohDr3sYvmSVYlzAWY6FIwbwJxo4GB7V 6ReNOrERYKTSlOnw1QAzgmHN1KShdjOdOAkFkKCY187qfI1T8vTzx27nHMEEqfmmvc8I khYCzGx/gc+6vReD2opoAKpZmLatWr3E9HKhggqZVAt2LIKXAzBcUc2v4DgmahYej5P5 U1EJxJWshdPvCnahH+nAPI1uLcfOIoGoznDfFp0wXR1Z6tGffEUq9FQa9oM0ISjwMIoN wyKg== X-Gm-Message-State: ACgBeo1WNWizVLZhkwh6XDIxK7Q9IC2t20GvUtKoWoPj2uVCaoW554FY RWkNvPcX0Oz6aigqJ2MuOxW9JvdOanE= X-Google-Smtp-Source: AA6agR5+Ww/s7u4XD1azUk5I5ZYmSipZxiExxoopJysRcyPZ8zjk++GJnOf429p9ygUYKujEBktJ1Rf+Pzg= X-Received: from glider.muc.corp.google.com ([2a00:79e0:9c:201:5207:ac36:fdd3:502d]) (user=glider job=sendgmr) by 2002:a05:6512:3054:b0:48a:f489:1d68 with SMTP id b20-20020a056512305400b0048af4891d68mr2401202lfb.260.1661526613226; Fri, 26 Aug 2022 08:10:13 -0700 (PDT) Date: Fri, 26 Aug 2022 17:08:06 +0200 In-Reply-To: <20220826150807.723137-1-glider@google.com> Mime-Version: 1.0 References: <20220826150807.723137-1-glider@google.com> X-Mailer: git-send-email 2.37.2.672.g94769d06f0-goog Message-ID: <20220826150807.723137-44-glider@google.com> Subject: [PATCH v5 43/44] mm: fs: initialize fsdata passed to write_begin/write_end interface From: Alexander Potapenko To: glider@google.com Cc: Alexander Viro , Alexei Starovoitov , Andrew Morton , Andrey Konovalov , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Christoph Hellwig , Christoph Lameter , David Rientjes , Dmitry Vyukov , Eric Dumazet , Greg Kroah-Hartman , Herbert Xu , Ilya Leoshkevich , Ingo Molnar , Jens Axboe , Joonsoo Kim , Kees Cook , Marco Elver , Mark Rutland , Matthew Wilcox , "Michael S. Tsirkin" , Pekka Enberg , Peter Zijlstra , Petr Mladek , Steven Rostedt , Thomas Gleixner , Vasily Gorbik , Vegard Nossum , Vlastimil Babka , kasan-dev@googlegroups.com, linux-mm@kvack.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org ARC-Authentication-Results: i=1; imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=DZGsI9l3; spf=pass (imf23.hostedemail.com: domain of 3VeIIYwYKCFwAFC78LAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--glider.bounces.google.com designates 209.85.208.201 as permitted sender) smtp.mailfrom=3VeIIYwYKCFwAFC78LAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1661526614; a=rsa-sha256; cv=none; b=W5EtS/L8oJNIYAb++rsiJGmMG9F4nH4Tcc5iciU2uGe/uM1CYL1497olrt51RmEy02/e4z /0A4pKaAywu9Mg/BGCnUvWIVsfC3AoVdCnJBrtpJBNe9GgMGfIDf7V3wc0vnj7WPf3jYQx CPCMye7GH/zIaSlzELIGBJiTnUu0mdA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1661526614; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=dGjdyFKcPZ8AZlzw9ep1EXgYBHGgW0m7GguSz7kBI6Q=; b=jChbddR25b8aQ4ntHnGU2mKROQ9i5Vmgyy7qeG+WI0zSYqGITHzfZu6Pz1o5UsaUw4htet DQC7aF476M3tkoLYzweZI5XpakH2x4flbPPQasmoa7a/5X37T5cA7W+f0kcg4JaBXNZtp1 cwLhIO4CW/zS4Y2VrZtuBqKJkWZ+qoE= X-Rspam-User: X-Stat-Signature: ufpne9s9fzfnz9zwahwewdawz9944grc X-Rspamd-Queue-Id: B5BB514000E Authentication-Results: imf23.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=DZGsI9l3; spf=pass (imf23.hostedemail.com: domain of 3VeIIYwYKCFwAFC78LAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--glider.bounces.google.com designates 209.85.208.201 as permitted sender) smtp.mailfrom=3VeIIYwYKCFwAFC78LAIIAF8.6IGFCHOR-GGEP46E.ILA@flex--glider.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspamd-Server: rspam09 X-HE-Tag: 1661526614-438443 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Functions implementing the a_ops->write_end() interface accept the `void *fsdata` parameter that is supposed to be initialized by the corresponding a_ops->write_begin() (which accepts `void **fsdata`). However not all a_ops->write_begin() implementations initialize `fsdata` unconditionally, so it may get passed uninitialized to a_ops->write_end(), resulting in undefined behavior. Fix this by initializing fsdata with NULL before the call to write_begin(), rather than doing so in all possible a_ops implementations. This patch covers only the following cases found by running x86 KMSAN under syzkaller: - generic_perform_write() - cont_expand_zero() and generic_cont_expand_simple() - page_symlink() Other cases of passing uninitialized fsdata may persist in the codebase. Signed-off-by: Alexander Potapenko --- Link: https://linux-review.googlesource.com/id/Ie300c21bbe9dea69a730745bd3c6d2720953bf41 --- fs/buffer.c | 4 ++-- fs/namei.c | 2 +- mm/filemap.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/buffer.c b/fs/buffer.c index 55e762a58eb65..e1198f4b28c8f 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2352,7 +2352,7 @@ int generic_cont_expand_simple(struct inode *inode, loff_t size) struct address_space *mapping = inode->i_mapping; const struct address_space_operations *aops = mapping->a_ops; struct page *page; - void *fsdata; + void *fsdata = NULL; int err; err = inode_newsize_ok(inode, size); @@ -2378,7 +2378,7 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, const struct address_space_operations *aops = mapping->a_ops; unsigned int blocksize = i_blocksize(inode); struct page *page; - void *fsdata; + void *fsdata = NULL; pgoff_t index, curidx; loff_t curpos; unsigned zerofrom, offset, len; diff --git a/fs/namei.c b/fs/namei.c index 53b4bc094db23..076ae96ca0b14 100644 --- a/fs/namei.c +++ b/fs/namei.c @@ -5088,7 +5088,7 @@ int page_symlink(struct inode *inode, const char *symname, int len) const struct address_space_operations *aops = mapping->a_ops; bool nofs = !mapping_gfp_constraint(mapping, __GFP_FS); struct page *page; - void *fsdata; + void *fsdata = NULL; int err; unsigned int flags; diff --git a/mm/filemap.c b/mm/filemap.c index 15800334147b3..ada25b9f45ad1 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -3712,7 +3712,7 @@ ssize_t generic_perform_write(struct kiocb *iocb, struct iov_iter *i) unsigned long offset; /* Offset into pagecache page */ unsigned long bytes; /* Bytes to write to page */ size_t copied; /* Bytes copied from user */ - void *fsdata; + void *fsdata = NULL; offset = (pos & (PAGE_SIZE - 1)); bytes = min_t(unsigned long, PAGE_SIZE - offset,