Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp3890110pxv; Mon, 19 Jul 2021 11:13:09 -0700 (PDT) X-Google-Smtp-Source: ABdhPJylwF70QtF9hP+elXidM08i2VjVWTHlOKp3BkEOcGwHRsFCdlY8DKOSj5WaeYUNOc2qQqBP X-Received: by 2002:aa7:de92:: with SMTP id j18mr5499477edv.141.1626718281533; Mon, 19 Jul 2021 11:11:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626718281; cv=none; d=google.com; s=arc-20160816; b=RbXo63k2QQ9H70dQgWnoGCQwvrCcvjUas6ovPYDzef78gFlUvntPwJ7Wfw2cYfLHMy Pfv1vuUhtXrh1UjVEh63vzQAvuzaY/cwwBsCmLcrG34s2BKRtw+4JOEQzp6MfF4cTEC4 5ei/sHmV2kQVzSOJXD+5Y14uTT2mAdMk5IzcrnpYQ2qyNVURwgv7+DijeLfceTx5Z0s/ a5ZmriHX3lIvTRQ0j7D4m3EfgLHi2JLe3wXiIDD+D60dcOgOkCXCxz6xfewB0OuJHjFO OqUGGnGKwY8+vmd5gjK80vOFk5LJVzcOVLjZxgrA4ZXRfNMAEAIM0rUqBWwVbO03AhfS OtGQ== 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=h9BPaH7z+Gl4YXqA8Lh5m+45AjENSWmfSqZ70dHlYf4=; b=REZA3QDnuHuhdNSY0zFQlegnjPAkd6ig8XYyzcvWvDfaY9T0aoo36TAjoCmOEUkAKp f8lm+kNdq6LpZECOqDPuNu2d/KcWCc8ixoi4NFGNNv39TNBTOZ8F1V2BTWEVSKJy2XBr c+814mHzvPaKmsakqe4PpzFLoKrByMESQ/9QQIMjdFpaSALnBKarcwIAQg1yjy2vOabI f8MNcqdw/MCg/u725VVdwIx3S+XYB8mpH110rCme5ltzAeye+2BcpIgwMHGJPEbJ12Bb tFt7j1ITzjNholeViTYCMbd6gtpF0qODR98oR6Q7sfHeq+bqvakpJXYJzO14TFu9rF2l hYyg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=P6smRn2m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 n7si19694468eju.536.2021.07.19.11.10.57; Mon, 19 Jul 2021 11:11:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-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=P6smRn2m; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-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 S1378625AbhGSR0A (ORCPT + 99 others); Mon, 19 Jul 2021 13:26:00 -0400 Received: from mail.kernel.org ([198.145.29.99]:45036 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349484AbhGSPpH (ORCPT ); Mon, 19 Jul 2021 11:45:07 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 915E06113A; Mon, 19 Jul 2021 16:25:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626711912; bh=2l3H4EHNYgT3yM4ZUxgFppRbrJS+2LeXY3D4BoXwaQ4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P6smRn2ml1Cg7lAlHmlnZgKoToHpl5ko0C+qqZ0qX3uFQHIFYKTrvBWPDaAGaE4dE jQo0D7/OY6v0UaV37N1ChI0kpTfVNxbpIF79sXo5gdKj7f6VVu0hJ2DuBgES+yA5Rn yH7D1VyeO4K5R0Z7hHpsfpNWcaJvSoBHlosJTUUo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Chao Yu , Jaegeuk Kim , Sasha Levin Subject: [PATCH 5.12 178/292] f2fs: compress: fix to disallow temp extension Date: Mon, 19 Jul 2021 16:54:00 +0200 Message-Id: <20210719144948.349908853@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210719144942.514164272@linuxfoundation.org> References: <20210719144942.514164272@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Chao Yu [ Upstream commit 4a67d9b07ac8dce7f1034e0d887f2f4ee00fe118 ] This patch restricts to configure compress extension as format of: [filename + '.' + extension] rather than: [filename + '.' + extension + (optional: '.' + temp extension)] in order to avoid to enable compression incorrectly: 1. compress_extension=so 2. touch file.soa 3. touch file.so.tmp Fixes: 4c8ff7095bef ("f2fs: support data compression") Signed-off-by: Chao Yu Signed-off-by: Jaegeuk Kim Signed-off-by: Sasha Levin --- fs/f2fs/namei.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/fs/f2fs/namei.c b/fs/f2fs/namei.c index 17bd072a5d39..11aafe93180c 100644 --- a/fs/f2fs/namei.c +++ b/fs/f2fs/namei.c @@ -153,7 +153,8 @@ fail_drop: return ERR_PTR(err); } -static inline int is_extension_exist(const unsigned char *s, const char *sub) +static inline int is_extension_exist(const unsigned char *s, const char *sub, + bool tmp_ext) { size_t slen = strlen(s); size_t sublen = strlen(sub); @@ -169,6 +170,13 @@ static inline int is_extension_exist(const unsigned char *s, const char *sub) if (slen < sublen + 2) return 0; + if (!tmp_ext) { + /* file has no temp extension */ + if (s[slen - sublen - 1] != '.') + return 0; + return !strncasecmp(s + slen - sublen, sub, sublen); + } + for (i = 1; i < slen - sublen; i++) { if (s[i] != '.') continue; @@ -194,7 +202,7 @@ static inline void set_file_temperature(struct f2fs_sb_info *sbi, struct inode * hot_count = sbi->raw_super->hot_ext_count; for (i = 0; i < cold_count + hot_count; i++) { - if (is_extension_exist(name, extlist[i])) + if (is_extension_exist(name, extlist[i], true)) break; } @@ -295,7 +303,7 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, hot_count = sbi->raw_super->hot_ext_count; for (i = cold_count; i < cold_count + hot_count; i++) { - if (is_extension_exist(name, extlist[i])) { + if (is_extension_exist(name, extlist[i], false)) { up_read(&sbi->sb_lock); return; } @@ -306,7 +314,7 @@ static void set_compress_inode(struct f2fs_sb_info *sbi, struct inode *inode, ext = F2FS_OPTION(sbi).extensions; for (i = 0; i < ext_cnt; i++) { - if (!is_extension_exist(name, ext[i])) + if (!is_extension_exist(name, ext[i], false)) continue; set_compress_context(inode); -- 2.30.2