From patchwork Mon May 10 10:20:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 433073 Delivered-To: patch@linaro.org Received: by 2002:a02:c901:0:0:0:0:0 with SMTP id t1csp2723653jao; Mon, 10 May 2021 04:01:25 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwXIsqK1izHC16g7IaahUAwfl8e/KkmVsfqEO1PUgk3hgROufUxG4SNIwd514EIit1vDkwr X-Received: by 2002:a05:6402:694:: with SMTP id f20mr28909104edy.93.1620644485012; Mon, 10 May 2021 04:01:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620644485; cv=none; d=google.com; s=arc-20160816; b=v8ZKVVdk76FQA1+zl3gdYnGaMbBypUAQnN9sgp26/cuh5c3TTltNMhSk8xf3b5844V HAsewzxvcfCsy3q/wKMXIKacVUTZcXnCvcwh96e0gZEWibk2S5Dvq1jJs3FQkCimoiga l/Py2OeUCf0hyRNosRwNtkhKCj4QdWlstomARwN5LcKT0x+zfcU+oabGBE6tX0txg2Ex Kjpthz0creBtn+su+Lm9eSmlCQkiMzPEcweTo/Lb6shu27dKCW6IQFA2hHw6UtESxYwY oUZkknqVVuFaQJodGlF692MIfjycNuRoILcn+DuLjSu79XmtqaNHlWQ+tw4Yyrjh53TF 21Hg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=aP6vsldme6qZrdIPNdKFE/aKm8r+eLvep2U4H5dxkL8=; b=BTU9BsJiwBIzVZI28jcwU9RwD2L61dP26BoyOwjKVO0aO1XNRlyIU6w9g8w/ED2H38 u2mBCpJmQziMy4vt0SaIh6nt0e2r6c81vYeSOxJrhLih/TtnBbBGEAu9QLC57J4AZXjb IrvuXKSUOvrKSP1CU6YZGsHptaEonKU+FdKHRAX+N+11arBqonJCl5vvJnLL3SsskJr7 y6jRKDB5yWQxbIzdf2Pj5oFD5J85KGyh9y5TL3vSnlbvTj+cmtAZWcDT7WBcOmLd9NcK aLSKduEXaKJ6OoKc6AwklazGZmdxuvsODrDHYA96g4gTHnI9RU736wD9YaOhb/iT8jJQ Jygw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cg1EUjW5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id r17si13500365edw.273.2021.05.10.04.01.24; Mon, 10 May 2021 04:01:25 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=cg1EUjW5; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232970AbhEJK7D (ORCPT + 12 others); Mon, 10 May 2021 06:59:03 -0400 Received: from mail.kernel.org ([198.145.29.99]:42174 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233669AbhEJKzG (ORCPT ); Mon, 10 May 2021 06:55:06 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 03A3761C18; Mon, 10 May 2021 10:42:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620643335; bh=vc4YkXsp9LYCBLtu1We7x1zKPK4f0rGvM9IOT7u5xfE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=cg1EUjW5tAn1AQY1TXuOqMIVGBVtV/YfBmGatAKUbHhnWEbxsz/AmIWBjWroY8lfu YT0srrKdCfFs6RoyHFQNYg5OYAy1zja5Wq74kmnmtziP0Gq38xpzZcY04PvmQHf0Qc PShLDvQG5OPi41+AnPmErbgIdMf2ecjNF/tc9ZKo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Joel Stanley , Christoph Hellwig , Lei YU , Richard Weinberger Subject: [PATCH 5.10 238/299] jffs2: Hook up splice_write callback Date: Mon, 10 May 2021 12:20:35 +0200 Message-Id: <20210510102012.823936206@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102004.821838356@linuxfoundation.org> References: <20210510102004.821838356@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Joel Stanley commit 42984af09afc414d540fcc8247f42894b0378a91 upstream. overlayfs using jffs2 as the upper filesystem would fail in some cases since moving to v5.10. The test case used was to run 'touch' on a file that exists in the lower fs, causing the modification time to be updated. It returns EINVAL when the bug is triggered. A bisection showed this was introduced in v5.9-rc1, with commit 36e2c7421f02 ("fs: don't allow splice read/write without explicit ops"). Reverting that commit restores the expected behaviour. Some digging showed that this was due to jffs2 lacking an implementation of splice_write. (For unknown reasons the warn_unsupported that should trigger was not displaying any output). Adding this patch resolved the issue and the test now passes. Cc: stable@vger.kernel.org Fixes: 36e2c7421f02 ("fs: don't allow splice read/write without explicit ops") Signed-off-by: Joel Stanley Reviewed-by: Christoph Hellwig Tested-by: Lei YU Signed-off-by: Richard Weinberger Signed-off-by: Greg Kroah-Hartman --- fs/jffs2/file.c | 1 + 1 file changed, 1 insertion(+) --- a/fs/jffs2/file.c +++ b/fs/jffs2/file.c @@ -57,6 +57,7 @@ const struct file_operations jffs2_file_ .mmap = generic_file_readonly_mmap, .fsync = jffs2_fsync, .splice_read = generic_file_splice_read, + .splice_write = iter_file_splice_write, }; /* jffs2_file_inode_operations */