Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp490966rwe; Fri, 26 Aug 2022 08:38:28 -0700 (PDT) X-Google-Smtp-Source: AA6agR6fS8CHOrOvXfxlBpITcBSz9T91MnjwZkqnHgHnHWNfU7XNRV9YiRQz8FOoE8RMFMG0SGS3 X-Received: by 2002:a17:907:a04f:b0:73d:becd:b35b with SMTP id gz15-20020a170907a04f00b0073dbecdb35bmr5930295ejc.235.1661528308099; Fri, 26 Aug 2022 08:38:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661528308; cv=none; d=google.com; s=arc-20160816; b=HnfNQRckHfAVnKAZm6UljnOjpfV4p0brl//vOyr2n2eu5KIiNWiho4ExdSO/TO4RsY HhYpuJvsKyKTfHZTZZ6bbtkYTUoV77RY3Ezp6+E0HReJNLPKnOrQwzNys0xPHDKHGHnH EPvRf07PaSSFKK0+6UJ6C3N3eT0L0T/65bR9fzFSy1jVggNyh9mq4FYyIJOYl3Snb4nw Emo6+4/U8YE7yeUJ1KKy3iA8opdnkQIwiDpooJsfp8G3W3zGEV23MffDvAqAHpg89Gm1 srffoeg0KNMzXlt5AE0x9pD7GyRfMD6EnBZ1W/otocUAkqClaLp9WKxs/qDFWj3XLxnc Zvvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=dGjdyFKcPZ8AZlzw9ep1EXgYBHGgW0m7GguSz7kBI6Q=; b=UGY76IR5/KEfnfBABLtaFZn0giQ5jeCon+HPZZ/ri68Ws7AxxOOH5vwKkob4vxTO4V 9muIYqD6Y76fn3QSpNVhpzOf1CLxN1ptYJ6d5UEnLPTEP/QQPIpnvoh1jpzo5BtxaeEx lT379ndbD/Fsyt4c0rz+cF24DmzZ5lZj8PbyFvnTqaU2lxbg8RTNZP1zjn8TcA3ABKyl vDPDHcIEhvTMgIUMzcrUlys4V8a0xjfSSb0iuVehemhX5CDC/jJVYiug8v9WMjZfo5mJ hTP05fwthp6BWlvkJSsnK9wjDa1O6xvrbJQeg8BQFn9dvI07+FBLoBsgsDYgVzDlkW70 OADQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DZGsI9l3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z27-20020a1709060adb00b0073cf90eb884si1282109ejf.490.2022.08.26.08.38.02; Fri, 26 Aug 2022 08:38:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=DZGsI9l3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344400AbiHZPQp (ORCPT + 99 others); Fri, 26 Aug 2022 11:16:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46632 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344499AbiHZPPi (ORCPT ); Fri, 26 Aug 2022 11:15:38 -0400 Received: from mail-lf1-x14a.google.com (mail-lf1-x14a.google.com [IPv6:2a00:1450:4864:20::14a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E3DBBBA66 for ; Fri, 26 Aug 2022 08:10:16 -0700 (PDT) Received: by mail-lf1-x14a.google.com with SMTP id y3-20020a197503000000b00492f3a13baeso294275lfe.12 for ; Fri, 26 Aug 2022 08:10:15 -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=LxFSpg+X03p3C7kvv8NQJ0Brx0lw1h8AcnmMeWsRRAh9eX3UVQPaoe32MVMZpoFwtt yCAOU8wApwwBpzDqxpKcF154FM0OLT9KvnltnZffk82EkwmJRHAjGu3IFKdsppK877uE eet1UMs2Gw2BFgNLEjGngqlD9XQlpDDVJDiEtvMRJ3rgsqpWRFlAWvVz0B7lSvQzIG0n P2vwHAAsiKJ4+bL4jSQwsieKuuxBk/UWX8DmasGgFxc2Kmk9nVb+Hqy1+OR01dOBo35Z wXpRzBgSxU24tne/UnDLh3K0hD31ZsPW1ADCid8bZncGxkxz1YaogKrqPcykBMlZUlZb zBcw== X-Gm-Message-State: ACgBeo0ojgE8UAIV7KmJ0pHGaTz4YuG0mc1IBfLOhCIZZ30Tt2oc0MVP MBB7/XUcc1NBoDBWOS5jUDuph3gKZlE= 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 Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, -- 2.37.2.672.g94769d06f0-goog