Received: by 2002:a05:7412:3b8b:b0:fc:a2b0:25d7 with SMTP id nd11csp2543329rdb; Mon, 12 Feb 2024 08:08:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVZvp7khtrk1qUp5GJMHTLlZ1Qt2Jjyv1XX1FRXVzntt50wR0d4nBb0dPPmEjLlZHKwV7GCpfIjrH14jkKdEfyl8Omd/y9ysdJOHwhXBg== X-Google-Smtp-Source: AGHT+IFdBN8BYxbTKTsTlmfG6JamOFBW1j77QFC4RSMU23TBOvIsJBKVo977voN1W6ST10QvXcPJ X-Received: by 2002:a05:620a:1a2a:b0:785:b02b:5e16 with SMTP id bk42-20020a05620a1a2a00b00785b02b5e16mr10032824qkb.15.1707754114027; Mon, 12 Feb 2024 08:08:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707754114; cv=pass; d=google.com; s=arc-20160816; b=bidWYQUR7o0V5TZs10Ilz6YXOJhISs1L6lJcwMNX0pTFVcIdHfDoY497P8P8vF5zAF P2Q3oy9XFRf9RingrtJcU+UDjZIctGuogG9LvIrkBDmM97vF3KpcSI7wq62UxmU333To pCu5MetMvpo5mK4O2ibpG15uvWXYIZ/XWBNlQOz0QL46TA3qqTH0iIr5AyQoEVVacOug kUdaHBvCQ8ocIC1AC4quZWQ+u5L9glMLWt1Feu/mX1rnRGJDG3QK93GF5ayFm0G+r3zs nLsKJNHJt2BC6TTx5vAGfD5yiZ4VOpc6wArD7w760xirSIipIkGJCuu5d6W8K/6xo8y5 YzCw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=/2InhzdCdbdALy1oJYLX4A2t+MNMq246GQ8Jswg6qq4=; fh=10xHsadp2azRQ8hCnc/EiH5F6md0iPfPH8dEhDnHmoM=; b=o0nh5QZl03mw18qSYORjAG0ZS84SM0U0us9Ybas1dK2sn+ip3B+ln3oVzfBFsB4FgC DTMyqWBNr+Cc26gshgXAi9xLsJmVVlHVhcLbWXesI8si79qDRnctwwRGG9Ozqffqxu9Y 0SYOrqYHlhd00erSDMmw/DFvEs5Vy9AeRliPJfcFNo5osd8A5dMj/ry4LBVkBVKWH1rs vlHtAW8I8YQZgxM+G3mtBF0TbecqO3tNZHiowFnOg0IGkpo14tovKTo63HoR7tNFcukB yhA0Q8Rb7PsWw6pyREdVWzG4dvOBWzjKWx/kIBk3GKQxM1mTCcUa+TIY04zR3MmVxN2g uVMQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y2cu4EFD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-61937-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61937-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org X-Forwarded-Encrypted: i=2; AJvYcCX/NCocXrwZXMY/lyT7uqifdNW8I95QSaY/hcl17rRkRddiwBZLrWqtl5TwF4vNcmXVMzVspvQuaTyD56qYIOvQYmfGSGLMQb02U6atlw== Return-Path: Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id h1-20020a05620a13e100b00785d6d13172si2426566qkl.164.2024.02.12.08.08.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Feb 2024 08:08:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-61937-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Y2cu4EFD; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-61937-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-61937-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id C2DCF1C21B22 for ; Mon, 12 Feb 2024 16:08:33 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 14EBA3D0B6; Mon, 12 Feb 2024 16:08:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Y2cu4EFD" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 31C853D0A9 for ; Mon, 12 Feb 2024 16:08:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707754107; cv=none; b=qXePAiaR2WEC0D1NGP9A2A2Se1IA3P4c2GOojGVlPCSFtmS7KS6Jr0ktPupwNmVI6eGpyB+ePSkniKdXWu79yFBGFAE0Uf0ndvtjIWwgmxx1WeL8Lt5G5T9gJTLLMBdiblJfo4WQrb2Wg61lUsOezozYg5vF6IB01i3TxZA2tgI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707754107; c=relaxed/simple; bh=Ms3jETJiDb4EcBDYV1Y+i+GWoHhcisMI0xE0j1gpI2U=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=qEl6lgIbisSlfx4WYVTes1dNxmnOjhGPmBG84QnVR/Qe8F4nbycD9xPGSujYJprh+3NnwUyaTvkI4gQXHBxGH4IwgPdZmmLcJwBbPKPHmgQfGZUqShlCk86/SldSYXFd4fERF6x5PH2N2c8ilsHyCK1A6DG/GUQddTvbOv93WoE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Y2cu4EFD; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0FDACC433F1; Mon, 12 Feb 2024 16:08:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1707754105; bh=Ms3jETJiDb4EcBDYV1Y+i+GWoHhcisMI0xE0j1gpI2U=; h=From:To:Cc:Subject:Date:From; b=Y2cu4EFD9qnbjoBlUafM0p11mG6L9waqaPUOVxb3yX9hTK5vzLE9F8XWhDI6IcLmg Tp4nhkaXMZnGfzGPa3ksH8oosIPoxTCPn9h0P1mQ38KhCX7faXRb+3ZGdm3ck0jmLN 5+8rkiYhkXB4jgwbr0iq5ni1uful1cNP/MKAi8vZFSBGPs6kw8uY+BQhYWHQ2rt217 RMs8GsQDU/BM2pcdXtCyJeBym5B/Zd60gUBjLWDLJayQD6E02/ahNkwrPnaS/W57fE 4/wjDkVOivyTfojCafXj/cFOs2MfI4qIw69QFGMs6+Jn7t+xOp8ncAiQACXa+6laJK zhskNU2ffhURg== From: Chao Yu To: jaegeuk@kernel.org Cc: linux-f2fs-devel@lists.sourceforge.net, linux-kernel@vger.kernel.org, Chao Yu Subject: [PATCH] f2fs: compress: fix to check zstd compress level correctly in mount option Date: Tue, 13 Feb 2024 00:08:18 +0800 Message-Id: <20240212160818.1020903-1-chao@kernel.org> X-Mailer: git-send-email 2.40.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit f2fs only support to config zstd compress level w/ a positive number due to layout design, but since commit e0c1b49f5b67 ("lib: zstd: Upgrade to latest upstream zstd version 1.4.10"), zstd supports negative compress level, so that zstd_min_clevel() may return a negative number, then w/ below mount option, .compress_level can be configed w/ a negative number, which is not allowed to f2fs, let's add check condition to avoid it. mount -o compress_algorithm=zstd:4294967295 /dev/sdx /mnt/f2fs Fixes: 00e120b5e4b5 ("f2fs: assign default compression level") Signed-off-by: Chao Yu --- fs/f2fs/super.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/fs/f2fs/super.c b/fs/f2fs/super.c index 1b718bebfaa1..a29b8e25a2ed 100644 --- a/fs/f2fs/super.c +++ b/fs/f2fs/super.c @@ -669,7 +669,7 @@ static int f2fs_set_lz4hc_level(struct f2fs_sb_info *sbi, const char *str) #ifdef CONFIG_F2FS_FS_ZSTD static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str) { - unsigned int level; + int level; int len = 4; if (strlen(str) == len) { @@ -683,9 +683,15 @@ static int f2fs_set_zstd_level(struct f2fs_sb_info *sbi, const char *str) f2fs_info(sbi, "wrong format, e.g. :"); return -EINVAL; } - if (kstrtouint(str + 1, 10, &level)) + if (kstrtoint(str + 1, 10, &level)) return -EINVAL; + /* f2fs does not support negative compress level now */ + if (level < 0) { + f2fs_info(sbi, "do not support negative compress level: %d", level); + return -ERANGE; + } + if (!f2fs_is_compress_level_valid(COMPRESS_ZSTD, level)) { f2fs_info(sbi, "invalid zstd compress level: %d", level); return -EINVAL; -- 2.40.1