From patchwork Wed Mar 1 13:46:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 13155953 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 16AB6C64EC7 for ; Wed, 1 Mar 2023 13:46:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229804AbjCANqs (ORCPT ); Wed, 1 Mar 2023 08:46:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39004 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229795AbjCANqo (ORCPT ); Wed, 1 Mar 2023 08:46:44 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4E1953BD94 for ; Wed, 1 Mar 2023 05:46:43 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id E833521A96; Wed, 1 Mar 2023 13:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1677678401; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ghw4JVQos3haE9QPfkGcEgUKzzIe6qyW/tNTldLLHJ8=; b=tR6tpVLckSRR0O6roMKIb3ksNEIoyVhXRhBOd+rtOD+PASFBNnruI9tirGHk2RDSqBXthA o88Aa2XkgNmgfULqrSkpIYz9qwNejCpnmmpNjehwy30svqF2lVN7VVW4uOtU4w1DGzJ75E ujxE7i2xP4jDYcVx/PZSDHcxu1njT4k= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1677678401; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ghw4JVQos3haE9QPfkGcEgUKzzIe6qyW/tNTldLLHJ8=; b=FArnSd1KkwhD2dXTZHKZz4cyBa0+gZlDJh0qldI6GV0cMyfVwXXo84QoYyyLsMxDXkjqHN sHCwyoLx/DO7btAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id DB32413A3E; Wed, 1 Mar 2023 13:46:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id dw4BNUFX/2OaIAAAMHmgww (envelope-from ); Wed, 01 Mar 2023 13:46:41 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 484EFA0660; Wed, 1 Mar 2023 14:46:41 +0100 (CET) From: Jan Kara To: Cc: Jan Kara Subject: [PATCH 1/3] udf: Fix lost writes in udf_adinicb_writepage() Date: Wed, 1 Mar 2023 14:46:35 +0100 Message-Id: <20230301134641.11819-1-jack@suse.cz> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230301133937.24267-1-jack@suse.cz> References: <20230301133937.24267-1-jack@suse.cz> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1054; i=jack@suse.cz; h=from:subject; bh=INfSJJlh+kEDMiZD1Gy+wYWQq66td3OL3HZp5BN3Uho=; b=owEBbQGS/pANAwAIAZydqgc/ZEDZAcsmYgBj/1c6r/wXPqWDyRNaR177HNP2hYa2B9D6r/0InRmk H+62kgSJATMEAAEIAB0WIQSrWdEr1p4yirVVKBycnaoHP2RA2QUCY/9XOgAKCRCcnaoHP2RA2RfkB/ wNY9YL6pLmhZskSmXfyVhFQaKOdNTBHZbljOit70IJ2/EEPpo10qg6ZRYkOSmLKSqDMghRdUxDK6On qzz6Ovtgj0YYJqMRaEAlDQT864L1Surge2TNakjCD1iPT+dg8LLDKBcgsL5/tx0N56hhjp1skO/3i5 iS03GwCURUZLKhjRKiDgLKQ38sOMuPHYvb0MiRl3fIGJj723NcvDBOiG7CIGY9xjWe4yNfBegutb6d tEkVQNAf2r8p6CydUTXyQSEyYJPJTUB5fyFytyeDu9fuNe9qBPGhE1ipJAnO8ERmsR3V+BwP3YFMVZ B1OA6/CWXTLNJxeAid3EejCWqT6Alz X-Developer-Key: i=jack@suse.cz; a=openpgp; fpr=93C6099A142276A28BBE35D815BC833443038D8C Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org The patch converting udf_adinicb_writepage() to avoid manually kmapping the page used memcpy_to_page() however that copies in the wrong direction (effectively overwriting file data with the old contents). What we should be using is memcpy_from_page() to copy data from the page into the inode and then mark inode dirty to store the data. Fixes: 5cfc45321a6d ("udf: Convert udf_adinicb_writepage() to memcpy_to_page()") Signed-off-by: Jan Kara Signed-off-by: Matthew Wilcox (Oracle) --- fs/udf/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index f7a9607c2b95..facaf3a20625 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -193,7 +193,7 @@ static int udf_adinicb_writepage(struct folio *folio, struct udf_inode_info *iinfo = UDF_I(inode); BUG_ON(!PageLocked(page)); - memcpy_to_page(page, 0, iinfo->i_data + iinfo->i_lenEAttr, + memcpy_from_page(iinfo->i_data + iinfo->i_lenEAttr, page, 0, i_size_read(inode)); unlock_page(page); mark_inode_dirty(inode); From patchwork Wed Mar 1 13:46:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 13155954 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B0330C64ED6 for ; Wed, 1 Mar 2023 13:46:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229907AbjCANqv (ORCPT ); Wed, 1 Mar 2023 08:46:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39008 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229862AbjCANqo (ORCPT ); Wed, 1 Mar 2023 08:46:44 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 325BC3D0AB for ; Wed, 1 Mar 2023 05:46:44 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id D65E221A90; Wed, 1 Mar 2023 13:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1677678401; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IZdwhReJi4XNpuO25dxH7OOoj+xqrb1d+JZ/S+SICEA=; b=gdBPsKDtEkpQiJDx6y4gXiSMSwU3k49w85s2eW28q1yPUzPMYP4s72UYSgIyvKRrNVtK+0 3CJQ9Ovxtbk6s2IxCM8pTlKKWp7VAJqf8bpTUhHGkFrr1gLV+051FFYHemA6Lrfs/TaReN 9qOMPRmf3zT7rkADYIgubV7yE33Cea8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1677678401; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=IZdwhReJi4XNpuO25dxH7OOoj+xqrb1d+JZ/S+SICEA=; b=M0MznNNFgEJswfzBiE0bYbWHsrtAlyVIMI5XlYJ+hfvpDgacnbaFxjfx5rmDUA53s/mO7d St9i4mZCyQc+SjCw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id C55D213A3E; Wed, 1 Mar 2023 13:46:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id hZwcMEFX/2OVIAAAMHmgww (envelope-from ); Wed, 01 Mar 2023 13:46:41 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 4EC55A06F3; Wed, 1 Mar 2023 14:46:41 +0100 (CET) From: Jan Kara To: Cc: Jan Kara Subject: [PATCH 2/3] udf: Fix reading of in-ICB files Date: Wed, 1 Mar 2023 14:46:36 +0100 Message-Id: <20230301134641.11819-2-jack@suse.cz> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230301133937.24267-1-jack@suse.cz> References: <20230301133937.24267-1-jack@suse.cz> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1166; i=jack@suse.cz; h=from:subject; bh=Yd1Gk45+R/Rtpj58o/PburCl2kErIZquHQ9LCprc5hc=; b=owEBbQGS/pANAwAIAZydqgc/ZEDZAcsmYgBj/1c7NK6bpqmNJlup9nz67qqqbXwQwFs+sEpVCMEs 6gAbEJaJATMEAAEIAB0WIQSrWdEr1p4yirVVKBycnaoHP2RA2QUCY/9XOwAKCRCcnaoHP2RA2Q4LB/ 0T1hh2wtG2Xnwwg7OpQ2M90rUIbY/u6Eoe3eZOih/7Ecgr9ByCsDFLfK3oNFHUpaafW9IcNa/YYEXl +6vtppiY+bgIm8Hb7sNRnsISfg0qqCLlXe27mmnSlAEzTWuCzl7ghP83jtIIkrDOvnhOk5cq1qg0av 0P7yV8CI71bPioV0CYjKQNsiMV8tWFh7nR+e3VCrJ3NzWvToMhAuMKR2cDi96puE8ge6zLFsCEttxb UdqUF9C7MCg9OnqaJRQ7S8iO8YRPbV/Zpvi9oL39D5anCsUzgEy5x3YXY/+YJDLJ36Esrg6Taku9gc hjbe30xGCyfedOGSKQDBjtiqsW97OI X-Developer-Key: i=jack@suse.cz; a=openpgp; fpr=93C6099A142276A28BBE35D815BC833443038D8C Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org After merging address space operations of normal and in-ICB files, readahead could get called for in-ICB files which resulted in udf_get_block() being called for these files. udf_get_block() is not prepared to be called for in-ICB files and ends up returning garbage results as it interprets file data as extent list. Fix the problem by skipping readahead for in-ICB files. Fixes: 37a8a39f7ad3 ("udf: Switch to single address_space_operations") Signed-off-by: Jan Kara --- fs/udf/inode.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index facaf3a20625..0cb7d8fba2c8 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -241,6 +241,15 @@ static int udf_read_folio(struct file *file, struct folio *folio) static void udf_readahead(struct readahead_control *rac) { + struct udf_inode_info *iinfo = UDF_I(rac->mapping->host); + + /* + * No readahead needed for in-ICB files and udf_get_block() would get + * confused for such file anyway. + */ + if (iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB) + return; + mpage_readahead(rac, udf_get_block); } From patchwork Wed Mar 1 13:46:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kara X-Patchwork-Id: 13155952 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B24BC64EC7 for ; Wed, 1 Mar 2023 13:46:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229905AbjCANqq (ORCPT ); Wed, 1 Mar 2023 08:46:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38992 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229537AbjCANqo (ORCPT ); Wed, 1 Mar 2023 08:46:44 -0500 Received: from smtp-out1.suse.de (smtp-out1.suse.de [IPv6:2001:67c:2178:6::1c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 424173BD8C for ; Wed, 1 Mar 2023 05:46:43 -0800 (PST) Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id DD06521A94; Wed, 1 Mar 2023 13:46:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1677678401; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwC6p7p7EWQuA/jOntkfena8fBOR8ngnNxaV8uDKAtU=; b=gJmOqP2DIOUUTqez6c6rMsD/V6Z4XuO2tDTrV6g+p/bdVhez1PIxDDaQGHLbT3D7q4aN9x AGrUzCLR+e5eeLzaClqvemEktZPMyVzOEOdu1yTEz1Q5jXVz8uaUp9SUMzxDeZip+hBnFR nNj3ZrUzsFFmA2a9C54n51/IeDq9/FI= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1677678401; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kwC6p7p7EWQuA/jOntkfena8fBOR8ngnNxaV8uDKAtU=; b=13nHOBvKvyPfZxPneoSfPxpN8Uc+QX7Y3T8rEAURbX/hZ5mtlfJHJicEvQGnW/c42onFkx 8HUh17Ipg1OKqECw== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id D0DE313A64; Wed, 1 Mar 2023 13:46:41 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id owX9MkFX/2OWIAAAMHmgww (envelope-from ); Wed, 01 Mar 2023 13:46:41 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 54FD5A06FD; Wed, 1 Mar 2023 14:46:41 +0100 (CET) From: Jan Kara To: Cc: Jan Kara Subject: [PATCH 3/3] udf: Warn if block mapping is done for in-ICB files Date: Wed, 1 Mar 2023 14:46:37 +0100 Message-Id: <20230301134641.11819-3-jack@suse.cz> X-Mailer: git-send-email 2.35.3 In-Reply-To: <20230301133937.24267-1-jack@suse.cz> References: <20230301133937.24267-1-jack@suse.cz> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=812; i=jack@suse.cz; h=from:subject; bh=JOtxpQycosan9JktofQYmnBk83p3THdLOYshQDwXg6g=; b=owEBbQGS/pANAwAIAZydqgc/ZEDZAcsmYgBj/1c83Ix4zZ+PInjK8z5PjQNFDgGlyTH4piUvedvy M0Q1pCOJATMEAAEIAB0WIQSrWdEr1p4yirVVKBycnaoHP2RA2QUCY/9XPAAKCRCcnaoHP2RA2adEB/ wNw1rHvSNao+f8oq3XisGC2FXKVSC42fgInmdk8HK4WsGoPM1jdRM2Y8qdGEMjfLlgq94p98vshNMb 44O2Sv1Tp+DtgVYjLlUA2+6aBi/umAizKPq8xT+ai1xmsgA0rbJyjKQHlGrPf0oIWg+JZFkOyZC4Gg Y2qLVKkrm0TMFLpFJVzvQGfqNVANqQgxnZKcAJ/4FLkF6sVzbnv+am9PA+nB/NRzYVV7eKlxL25EUd EiT/E0/47bPHbIvEVlITgsOng1tNFjlBto60G/H5RnUeSgTm5svcTG9CZC/GK8wDmbP1dP5SxhxPoW HddSFpCXfxVZQOlRmfDIb7LIBQM9vb X-Developer-Key: i=jack@suse.cz; a=openpgp; fpr=93C6099A142276A28BBE35D815BC833443038D8C Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org Now that address space operations are merge dfor in-ICB and normal files, it is more likely some code mistakenly tries to map blocks for in-ICB files. WARN and return error instead of silently returning garbage. Signed-off-by: Jan Kara --- fs/udf/inode.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 0cb7d8fba2c8..2210e5eb1ea0 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -416,6 +416,9 @@ static int udf_map_block(struct inode *inode, struct udf_map_rq *map) int err; struct udf_inode_info *iinfo = UDF_I(inode); + if (WARN_ON_ONCE(iinfo->i_alloc_type == ICBTAG_FLAG_AD_IN_ICB)) + return -EFSCORRUPTED; + map->oflags = 0; if (!(map->iflags & UDF_MAP_CREATE)) { struct kernel_lb_addr eloc;