From patchwork Wed Feb 7 02:01:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhiguo Niu X-Patchwork-Id: 197703 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1951547dyb; Tue, 6 Feb 2024 18:17:33 -0800 (PST) X-Google-Smtp-Source: AGHT+IFQ3Th4l3gQDLL8ZO0iIekPIzcUVb3qVUwzHe4KAebfSFz9Am40/LfBopLatruxD5938GZR X-Received: by 2002:a05:6e02:ec3:b0:363:acbc:c106 with SMTP id i3-20020a056e020ec300b00363acbcc106mr4218916ilk.18.1707272253803; Tue, 06 Feb 2024 18:17:33 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707272253; cv=pass; d=google.com; s=arc-20160816; b=ED4ksGFszkKJZM1Bnoh/tcjfJw3d+zrkFip+MpRgehJnBRvap71Z61MUp2erupOsdK 4rrSy5lLlAPKMpgLcHTjxzVhNkH8JyMvJVYjYI8yQakeWC9WITnWg26zkPiqCrUvLFMs yo3PjrwSgTfIVR9S+csX1hziP4xrw4tDwbaAL+HzkXnEWWIizwbMxruCZG+hIDloL9Lg bnxH1mjjSYqNnV+jVkaxYmXXgK1VsJMZrCoMTNTSEq3jljAX+an2E67/Z1aPPLp70X2i kG3EKrjrMZDCizMmPUTPq9blCfNQAfdEpeobvcJ+cWMURnp/YwzJuoiSEcUBpIZ+h6fu EUKw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:in-reply-to:message-id:date:subject:cc:to:from; bh=NWtkAVeJ9KZLPFoWOjJPFsaKFQ05kqDAUgrmDVzZhFI=; fh=5YtoraN5byGIJTJ2QusdPFSicNe4eDuJLtPj9g8K5ZI=; b=VzfJIIFoRnhz8CqfIc3kbsHxc7ADKRZM9pGBGzeFRfosLwMXwXATqHzKk1iJqdZJnf Buu6SpfQyG0Rleyd2k8jxpSss5MWD7QOAv4ZRyLggpGHyZRFNsTJyOX8fNPC2dHQRec/ 2F2EXOVI6nxRKgUSwuLMpw1v4qHWxXz93YPKgeRci3n3xk2DhEPw1AX8USeZspjKQC8o Xs974J1uQCuhVy6Ja/XctjQNgazXbSapBYkRX4C/nCCHRp8cpvlcJ050f+tV60UJw4Ob zbZktAi8GbL2hSG4P6ckY93hWSnorMwNLVC/3VjaZStmAfJCbVnnYdesXSDJJToBKw+w FMQg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=unisoc.com); spf=pass (google.com: domain of linux-kernel+bounces-55830-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55830-ouuuleilei=gmail.com@vger.kernel.org" X-Forwarded-Encrypted: i=2; AJvYcCU8EG8li8EEfvqIaoEwEKODpVkkzj+5LwU0xGSkRPhuef1L9HqRrc5p4XDpQnvyI1vyFYqjzEqhVcWwl0rqeed2e8qGtA== Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id d126-20020a633684000000b005d8c0f041ccsi332586pga.458.2024.02.06.18.17.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 18:17:33 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55830-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=unisoc.com); spf=pass (google.com: domain of linux-kernel+bounces-55830-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55830-ouuuleilei=gmail.com@vger.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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 1471328B8B4 for ; Wed, 7 Feb 2024 02:03:06 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C2FBE14AAD; Wed, 7 Feb 2024 02:02:15 +0000 (UTC) Received: from SHSQR01.spreadtrum.com (mx1.unisoc.com [222.66.158.135]) (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 6CAA712E74 for ; Wed, 7 Feb 2024 02:02:11 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=222.66.158.135 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707271334; cv=none; b=VylOc8HJkJQlGhAerQD5vf/g4Ydn9dBc6NmZ2ZVsY0BfLLfBTA1gIvBpPM2DEYsYslHeoyXwZdibk07/FVkZPUGsw4HHM9PiJ04oXlV/pQrAYP/aIZEqkvhKbZMIH4+eaiLJ7spqkvSREm1kAmokgCj1QErXOz16nsqaHafoc3k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707271334; c=relaxed/simple; bh=8iTvrOWdUHwLUYIO0I51Nm4DAdcTJoccfesvR6ZoX/g=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=BQjH7iDihEs9UnCMVlnktENpG1d2VVl3JB50mlnBlerVA3gjMiAJHUTIz9LvLrFQTqSmEn3lspKte/b2vZ2kpcKtgU+fAG2/M4qafPdFjLCJpqCDkRP+wFcWYHOoYQdwYelmmoFaWJWAoiD9v1psmEcpfFQsn3/OWZq2ccUWKPY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com; spf=pass smtp.mailfrom=unisoc.com; arc=none smtp.client-ip=222.66.158.135 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=unisoc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=unisoc.com Received: from dlp.unisoc.com ([10.29.3.86]) by SHSQR01.spreadtrum.com with ESMTP id 41721YXP075835; Wed, 7 Feb 2024 10:01:34 +0800 (+08) (envelope-from Zhiguo.Niu@unisoc.com) Received: from SHDLP.spreadtrum.com (bjmbx02.spreadtrum.com [10.0.64.8]) by dlp.unisoc.com (SkyGuard) with ESMTPS id 4TV3J65frxz2K4cHw; Wed, 7 Feb 2024 10:01:26 +0800 (CST) Received: from bj08434pcu.spreadtrum.com (10.0.73.87) by BJMBX02.spreadtrum.com (10.0.64.8) with Microsoft SMTP Server (TLS) id 15.0.1497.23; Wed, 7 Feb 2024 10:01:31 +0800 From: Zhiguo Niu To: , CC: , , , , , Subject: [PATCH v2 3/4] f2fs: enhance judgment conditions of GET_SEGNO Date: Wed, 7 Feb 2024 10:01:03 +0800 Message-ID: <1707271264-5551-4-git-send-email-zhiguo.niu@unisoc.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1707271264-5551-1-git-send-email-zhiguo.niu@unisoc.com> References: <1707271264-5551-1-git-send-email-zhiguo.niu@unisoc.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: SHCAS03.spreadtrum.com (10.0.1.207) To BJMBX02.spreadtrum.com (10.0.64.8) X-MAIL: SHSQR01.spreadtrum.com 41721YXP075835 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790204710736174724 X-GMAIL-MSGID: 1790204710736174724 NULL_SEGNO should also be returned when the blk_addr value is out-of-bound main area even __is_valid_data_blkaddr return true. For example, a 64MB partition with total 24 main segments has no any free segments left, then a new wrtie request use get_new_segment may get a out-of-bound segno 24 if CONFIG_F2FS_CHECK_FS is not enabled. GET_SEGNO should also return NULL_SEGNO in this case rather than treating is as valid segment. Besides, if the caller of GET_SEGNO does not ensure blk_addr pass to GET_SEGNO is valid, it should do sanity check about return value of GET_SEGNO, avoid causing some unexpected problems later. Signed-off-by: Zhiguo Niu --- fs/f2fs/file.c | 7 ++++++- fs/f2fs/segment.c | 4 +++- fs/f2fs/segment.h | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c index 23cd6a1..2cd3cd9 100644 --- a/fs/f2fs/file.c +++ b/fs/f2fs/file.c @@ -2985,9 +2985,14 @@ static int f2fs_ioc_flush_device(struct file *filp, unsigned long arg) if (ret) return ret; - if (range.dev_num != 0) + if (range.dev_num != 0) { dev_start_segno = GET_SEGNO(sbi, FDEV(range.dev_num).start_blk); + if (dev_start_segno == NULL_SEGNO) + return -EINVAL; + } dev_end_segno = GET_SEGNO(sbi, FDEV(range.dev_num).end_blk); + if (dev_end_segno == NULL_SEGNO) + return -EINVAL; start_segno = sm->last_victim[FLUSH_DEVICE]; if (start_segno < dev_start_segno || start_segno >= dev_end_segno) diff --git a/fs/f2fs/segment.c b/fs/f2fs/segment.c index f373ff7..6772ad4 100644 --- a/fs/f2fs/segment.c +++ b/fs/f2fs/segment.c @@ -2496,7 +2496,7 @@ void f2fs_invalidate_blocks(struct f2fs_sb_info *sbi, block_t addr) struct sit_info *sit_i = SIT_I(sbi); f2fs_bug_on(sbi, addr == NULL_ADDR); - if (addr == NEW_ADDR || addr == COMPRESS_ADDR) + if (segno == NULL_SEGNO) return; f2fs_invalidate_internal_cache(sbi, addr); @@ -3708,6 +3708,8 @@ void f2fs_do_replace_block(struct f2fs_sb_info *sbi, struct f2fs_summary *sum, unsigned char old_alloc_type; segno = GET_SEGNO(sbi, new_blkaddr); + if (segno == NULL_SEGNO) + return; se = get_seg_entry(sbi, segno); type = se->type; diff --git a/fs/f2fs/segment.h b/fs/f2fs/segment.h index f2847f1..b0ea315 100644 --- a/fs/f2fs/segment.h +++ b/fs/f2fs/segment.h @@ -96,7 +96,8 @@ static inline void sanity_check_seg_type(struct f2fs_sb_info *sbi, (GET_SEGOFF_FROM_SEG0(sbi, blk_addr) & ((sbi)->blocks_per_seg - 1)) #define GET_SEGNO(sbi, blk_addr) \ - ((!__is_valid_data_blkaddr(blk_addr)) ? \ + ((!__is_valid_data_blkaddr(blk_addr) || \ + !f2fs_is_valid_blkaddr(sbi, blk_addr, DATA_GENERIC)) ? \ NULL_SEGNO : GET_L2R_SEGNO(FREE_I(sbi), \ GET_SEGNO_FROM_SEG0(sbi, blk_addr))) #define BLKS_PER_SEC(sbi) \