From patchwork Tue Nov 15 14:25:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gao Xiang X-Patchwork-Id: 20400 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp2760345wru; Tue, 15 Nov 2022 06:29:10 -0800 (PST) X-Google-Smtp-Source: AA0mqf764v0KN2zv+FygFuOi3yibpeSoERv3N3TLeE+yzBtIe518ls3BJf4LnQ9TQpsj+GLCesfQ X-Received: by 2002:a05:6a00:1c84:b0:569:92fa:cbbc with SMTP id y4-20020a056a001c8400b0056992facbbcmr18911668pfw.77.1668522550359; Tue, 15 Nov 2022 06:29:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668522550; cv=none; d=google.com; s=arc-20160816; b=qF0GMFi8xh42pO5gone3uOwS+kxFSDK46fBE3FgcbbzPV2q7HXP0rhfXqQQvg5tA6B c7eG91LrrCm6VeZY7Pz82K3ePHFK2OHbLgKgMdPQ4Ak+Hc+ibdgSEnXhi6PiR5pRhn5P yfdpsZ8sBnUi1d6oJXbM8aNif1z02C4QOYYcAotsTubOrwjq8y2cBxRU1cr/YiSP7OYl ERCjPU5Vl57136zAQIAbi9pXmDfxQhTZqlpo9brfzjECLZDmiKdM31jbL8HT31b/tRu0 NuzqiK2QAb/Z2ycY81DkRm3iCku2cb++qvpBHQwQfGvcz8OFukQfToBDm05ZEz/gYVxW 8IaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version :mail-followup-to:message-id:subject:cc:to:from:date:dkim-signature; bh=YDGpZ+WDkRF2Ijm7/lA8NYakP9gZUDca+jOqyw2BVj0=; b=IDJcp8GgMizQ+CKP9YBNo8hwB3Kl1cI2iGXSKW8RAHnCwChG+ZWNzPZJ87vWKuxUsh 03Jg3o4WwppOOUGSTgrljTVvmRtVGEyipnRgriV2fkM8JyWD8TnnWhCtC56LrdxYRqte K6E9j+N+LavVY7Gr0VKOCw8l9UrcgDoNaOsAOAuX8Nd5jm4wXLgoCixKf07aDFM/knBm WLWS7H/qSpzQYYVRWJkEutQtXFy+ce5yTKfdM36+woZoMG/HeO7d2km26TxJKmcAUcC0 nbDEyaWPljh0sfvFquW+wVTZxB86nOBS0BCP8oLa4agSkXqdIJnQUvSnuDmMIlNALcXA wSDg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=l5Pktcy4; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lb7-20020a17090b4a4700b00205da45d8a5si19258863pjb.124.2022.11.15.06.28.56; Tue, 15 Nov 2022 06:29:10 -0800 (PST) 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=@kernel.org header.s=k20201202 header.b=l5Pktcy4; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229929AbiKOO0C (ORCPT + 99 others); Tue, 15 Nov 2022 09:26:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48194 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbiKOOZ6 (ORCPT ); Tue, 15 Nov 2022 09:25:58 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C9B4112606 for ; Tue, 15 Nov 2022 06:25:57 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6C804617C8 for ; Tue, 15 Nov 2022 14:25:57 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96B16C433C1; Tue, 15 Nov 2022 14:25:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1668522356; bh=WXu6kxIQDc98LvRRfjvGWQ6aV8piv1ExqJ/ldXVYpBg=; h=Date:From:To:Cc:Subject:From; b=l5Pktcy4VNyVfeoHn/2Ew9ji3BKPDu9R7l6pExb9L6//QezjtM2LdxsQNKvWkIna3 UGeyfbozku4nrUT6EXVh6Wax0HFY56IGO0PJtval45STmpqB47j/3ISqwC5NRNJTjk 4RaXby5tZyGHvgp7iZVz5u72lLWqUUle5+4vDjjhTj+JxMMlYymJhA/J66137bHR4S 4CaOC3QpJejOZhCjCS3bv7ZWahpkILMwIfB6Y3h79thjaYUxEF5PcYaL0IlFXhZgns VJWSwSiHBBlTb9WD+ZOBJbCJ/hS4JjiKQTU49np/CO4poxmJFP21u3r3ZM2C5qxFXe Bp8tPeDEBDIVQ== Date: Tue, 15 Nov 2022 22:25:50 +0800 From: Gao Xiang To: Linus Torvalds Cc: Chao Yu , Yue Hu , Jingbo Xu , David Howells , linux-erofs@lists.ozlabs.org, LKML Subject: [GIT PULL] erofs fixes for 6.1-rc6 Message-ID: Mail-Followup-To: Linus Torvalds , Chao Yu , Yue Hu , Jingbo Xu , David Howells , linux-erofs@lists.ozlabs.org, LKML MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1749572702208889896?= X-GMAIL-MSGID: =?utf-8?q?1749572702208889896?= Hi Linus, Could you consider these three fixes for 6.1-rc6? Most patches randomly fix error paths or corner cases in fscache mode reported recently. And the rest one fixes an invalid access relating to fragments on crafted images. Details are shown as below. I should submit earlier for -rc5 but actually delay a bit since one commit message got minor updated. All commits have been in linux-next and no merge conflicts. Thanks, Gao Xiang The following changes since commit f0c4d9fc9cc9462659728d168387191387e903cc: Linux 6.1-rc4 (2022-11-06 15:07:11 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git tags/erofs-for-6.1-rc6-fixes for you to fetch changes up to 37020bbb71d911431e16c2c940b97cf86ae4f2f6: erofs: fix missing xas_retry() in fscache mode (2022-11-14 23:48:38 +0800) ---------------------------------------------------------------- Changes since last update: - Fix packed_inode invalid access when reading fragments on crafted images; - Add a missing erofs_put_metabuf() in an error path in fscache mode; - Fix incorrect `count' for unmapped extents in fscache mode; - Fix use-after-free of fsid and domain_id string when remounting; - Fix missing xas_retry() in fscache mode. ---------------------------------------------------------------- Jingbo Xu (4): erofs: put metabuf in error path in fscache mode erofs: get correct count for unmapped range in fscache mode erofs: fix use-after-free of fsid and domain_id string erofs: fix missing xas_retry() in fscache mode Yue Hu (1): erofs: fix general protection fault when reading fragment fs/erofs/fscache.c | 35 +++++++++++++++++++++-------------- fs/erofs/internal.h | 6 ++++-- fs/erofs/super.c | 39 ++++++++++++++++++++++----------------- fs/erofs/sysfs.c | 8 ++++---- fs/erofs/zdata.c | 3 +++ 5 files changed, 54 insertions(+), 37 deletions(-)