From nobody Thu Nov 28 22:44:35 2024 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.6]) by smtp.subspace.kernel.org (Postfix) with ESMTP id BC75E15B97B for ; Thu, 26 Sep 2024 12:08:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.6 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727352500; cv=none; b=GUMcGTywzMMbYa+LhfXw/EpQVnOdrY6YkEiHB1GHWwZ8vuDZdjHsLVxd+ICI19MzSEWCnvfOedG146B/URLQxo485nGh7FVDbMyuf6WbFNgQ2UPbiHPtJljL+f0n0I8g7DrbZHiDCPFjbd0RlHi9A2qnYgstf47oej7rDDwghdo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727352500; c=relaxed/simple; bh=fTUgQXQV+kssQOAHRrXmcSuZwzzq+jYLUFBuk77wDmM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pMc5AM1I5w4bElTa9iNLut3zmu0rrcd2CaEFTnIesmtWe+oOefthM4DcopqM8JMid8x9t8NBl4fRxFhedtGN9C00dtonWgvGEb0JFtQd6bwLoIKOmlLtzGa4XX/uxiP5YFMfvF7cKKmRjP8zpvYejjiDVhjWxwtxiyD88CfmsQY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com; spf=pass smtp.mailfrom=126.com; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b=ITiA1ON7; arc=none smtp.client-ip=220.197.31.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=126.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="ITiA1ON7" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=hydKP oFUkIXlz7wEGCsFCoDE+OtccpTc+Dc6ACtlA2o=; b=ITiA1ON7XY4bxnHV5JCoK pEvNbzY5C2YQtRWxZXnCM5e6UTfwXPZcN5RNHbC7X0sIFYf312Bwgp7RYu4zdwPx q0J12r8owzIziQrnL2FsH7wrHIK+IE9S406Mv5dU5JlayLyXIFDP5GL/khfBIHNa vdzkD0Ly70JWBG3X63fcBQ= Received: from localhost.localdomain (unknown [123.149.2.202]) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wD3P+ihTvVmYf4FAA--.19120S3; Thu, 26 Sep 2024 20:08:03 +0800 (CST) From: Zhao Mengmeng To: jack@suse.com, zhaomengmeng@kylinos.cn Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] udf: refactor udf_current_aext() to handle error Date: Thu, 26 Sep 2024 20:07:51 +0800 Message-ID: <20240926120753.3639404-2-zhaomzhao@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240926120753.3639404-1-zhaomzhao@126.com> References: <20240926120753.3639404-1-zhaomzhao@126.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wD3P+ihTvVmYf4FAA--.19120S3 X-Coremail-Antispam: 1Uf129KBjvJXoW3Xr13Ar15tw48Jry3Ww43GFg_yoWxXr4fpF W2kasFkw43XrWxuw4IqF4DZF1aqaykGr47Gr12q34rtF4jgr1rtF1Utr4IvFyYgrs5Gw1a qFs5tryq9w42y37anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07UqYL9UUUUU= X-CM-SenderInfo: 52kd0zp2kd0qqrswhudrp/1tbi6Almd2b1Sv8njwABs- Content-Type: text/plain; charset="utf-8" From: Zhao Mengmeng As Jan suggested in links below, refactor udf_current_aext() to differentiate between error and "hit EOF", it now takes pointer to etype to store the extent type, return 0 when get etype success; return -ENODATA when hit EOF; return -EINVAL when i_alloc_type invalid. Add two macroes to test return value. Link: https://lore.kernel.org/all/20240912111235.6nr3wuqvktecy3vh@quack3/ Signed-off-by: Zhao Mengmeng Suggested-by: Jan Kara --- fs/udf/inode.c | 37 +++++++++++++++++++++++-------------- fs/udf/truncate.c | 10 ++++++++-- fs/udf/udfdecl.h | 8 ++++++-- 3 files changed, 37 insertions(+), 18 deletions(-) diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 4726a4d014b6..3be59aa8d4fd 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -1955,6 +1955,7 @@ int udf_setup_indirect_aext(struct inode *inode, udf_= pblk_t block, struct extent_position nepos; struct kernel_lb_addr neloc; int ver, adsize; + int err =3D 0; =20 if (UDF_I(inode)->i_alloc_type =3D=3D ICBTAG_FLAG_AD_SHORT) adsize =3D sizeof(struct short_ad); @@ -1999,10 +2000,12 @@ int udf_setup_indirect_aext(struct inode *inode, ud= f_pblk_t block, if (epos->offset + adsize > sb->s_blocksize) { struct kernel_lb_addr cp_loc; uint32_t cp_len; - int cp_type; + int8_t cp_type; =20 epos->offset -=3D adsize; - cp_type =3D udf_current_aext(inode, epos, &cp_loc, &cp_len, 0); + err =3D udf_current_aext(inode, epos, &cp_loc, &cp_len, &cp_type, 0); + if (err < 0) + goto err_out; cp_len |=3D ((uint32_t)cp_type) << 30; =20 __udf_add_aext(inode, &nepos, &cp_loc, cp_len, 1); @@ -2017,6 +2020,9 @@ int udf_setup_indirect_aext(struct inode *inode, udf_= pblk_t block, *epos =3D nepos; =20 return 0; +err_out: + brelse(bh); + return err; } =20 /* @@ -2167,9 +2173,12 @@ int8_t udf_next_aext(struct inode *inode, struct ext= ent_position *epos, { int8_t etype; unsigned int indirections =3D 0; + int err =3D 0; + + while ((err =3D udf_current_aext(inode, epos, eloc, elen, &etype, inc))) { + if (err || etype !=3D (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) + break; =20 - while ((etype =3D udf_current_aext(inode, epos, eloc, elen, inc)) =3D=3D - (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) { udf_pblk_t block; =20 if (++indirections > UDF_MAX_INDIR_EXTS) { @@ -2190,14 +2199,14 @@ int8_t udf_next_aext(struct inode *inode, struct ex= tent_position *epos, } } =20 - return etype; + return !err ? etype : -1; } =20 -int8_t udf_current_aext(struct inode *inode, struct extent_position *epos, - struct kernel_lb_addr *eloc, uint32_t *elen, int inc) +int udf_current_aext(struct inode *inode, struct extent_position *epos, + struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype, + int inc) { int alen; - int8_t etype; uint8_t *ptr; struct short_ad *sad; struct long_ad *lad; @@ -2224,8 +2233,8 @@ int8_t udf_current_aext(struct inode *inode, struct e= xtent_position *epos, case ICBTAG_FLAG_AD_SHORT: sad =3D udf_get_fileshortad(ptr, alen, &epos->offset, inc); if (!sad) - return -1; - etype =3D le32_to_cpu(sad->extLength) >> 30; + return -ENODATA; + *etype =3D le32_to_cpu(sad->extLength) >> 30; eloc->logicalBlockNum =3D le32_to_cpu(sad->extPosition); eloc->partitionReferenceNum =3D iinfo->i_location.partitionReferenceNum; @@ -2234,17 +2243,17 @@ int8_t udf_current_aext(struct inode *inode, struct= extent_position *epos, case ICBTAG_FLAG_AD_LONG: lad =3D udf_get_filelongad(ptr, alen, &epos->offset, inc); if (!lad) - return -1; - etype =3D le32_to_cpu(lad->extLength) >> 30; + return -ENODATA; + *etype =3D le32_to_cpu(lad->extLength) >> 30; *eloc =3D lelb_to_cpu(lad->extLocation); *elen =3D le32_to_cpu(lad->extLength) & UDF_EXTENT_LENGTH_MASK; break; default: udf_debug("alloc_type =3D %u unsupported\n", iinfo->i_alloc_type); - return -1; + return -EINVAL; } =20 - return etype; + return 0; } =20 static int udf_insert_aext(struct inode *inode, struct extent_position epo= s, diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c index a686c10fd709..16db2613401d 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c @@ -188,6 +188,7 @@ int udf_truncate_extents(struct inode *inode) loff_t byte_offset; int adsize; struct udf_inode_info *iinfo =3D UDF_I(inode); + int err =3D 0; =20 if (iinfo->i_alloc_type =3D=3D ICBTAG_FLAG_AD_SHORT) adsize =3D sizeof(struct short_ad); @@ -217,8 +218,8 @@ int udf_truncate_extents(struct inode *inode) else lenalloc -=3D sizeof(struct allocExtDesc); =20 - while ((etype =3D udf_current_aext(inode, &epos, &eloc, - &elen, 0)) !=3D -1) { + while (!(err =3D udf_current_aext(inode, &epos, &eloc, &elen, &etype, + 0))) { if (etype =3D=3D (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) { udf_write_aext(inode, &epos, &neloc, nelen, 0); if (indirect_ext_len) { @@ -253,6 +254,11 @@ int udf_truncate_extents(struct inode *inode) } } =20 + if (UDF_EXT_ERR(err)) { + brelse(epos.bh); + return err; + } + if (indirect_ext_len) { BUG_ON(!epos.bh); udf_free_blocks(sb, NULL, &epos.block, 0, indirect_ext_len); diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 88692512a466..a902652450dd 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -43,6 +43,9 @@ extern __printf(3, 4) void _udf_warn(struct super_block *= sb, #define UDF_NAME_LEN 254 #define UDF_NAME_LEN_CS0 255 =20 +#define UDF_EXT_EOF(err) ((err) =3D=3D -ENODATA) +#define UDF_EXT_ERR(err) (((err) < 0) && (!UDF_EXT_EOF(err))) + static inline size_t udf_file_entry_alloc_offset(struct inode *inode) { struct udf_inode_info *iinfo =3D UDF_I(inode); @@ -171,8 +174,9 @@ extern void udf_write_aext(struct inode *, struct exten= t_position *, extern int8_t udf_delete_aext(struct inode *, struct extent_position); extern int8_t udf_next_aext(struct inode *, struct extent_position *, struct kernel_lb_addr *, uint32_t *, int); -extern int8_t udf_current_aext(struct inode *, struct extent_position *, - struct kernel_lb_addr *, uint32_t *, int); +extern int udf_current_aext(struct inode *inode, struct extent_position *e= pos, + struct kernel_lb_addr *eloc, uint32_t *elen, + int8_t *etype, int inc); extern void udf_update_extra_perms(struct inode *inode, umode_t mode); =20 /* misc.c */ --=20 2.43.0 From nobody Thu Nov 28 22:44:35 2024 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.6]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 21219171088 for ; Thu, 26 Sep 2024 12:08:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.6 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727352501; cv=none; b=n4sXKCir7VlCJRWCLFqYA5zhPwxCWTfUCbG2cCk/6y56Yy8Reks//G+k35h2AbMLI+KETTYI+zKOyrWGhvH1Rut6E4k0hLW/vDolNxpLIfsgbl2ib3UhUWroAGs+pQbo/DvhBMrX+QAnpZS326F+v6gCi0ttaqlPTM/4QYKOnyE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727352501; c=relaxed/simple; bh=vbbboRPgS7Rx7iE5AlzTzY+kiSkTxNPI2RzlawdEwXg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rnxKLtXEa0Qyfu+9/1bQpmyXjtRKPJxgkvfUCfCfg+6UbS3womKkHkjijmTpYzdQfGCxd1oDE9/j9dFitVGc3drZhdnGoSLzJVkoXwbAOZYvCjNEfzag6WJBO7d36lNbQiBpzfiC4GKSaxuDhyYEiAiUfFgBt6/4lSHAK6QRXb4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com; spf=pass smtp.mailfrom=126.com; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b=B2+E6/Gq; arc=none smtp.client-ip=220.197.31.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=126.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="B2+E6/Gq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=aoRkE xUyXUmMawRqRp+U/MHZbGOS4Ww2tQ0S4v6i0ns=; b=B2+E6/Gq8PrParp9fPDHo 8nOdCB+5ulkrNox4m8+EAT6vgG/tawXuXkwYf5jZiNussPXOP0MPMVrL04KuXlSX 0K8lx7brZpVCUzwOzedsFHBcIxkW2s2LeuL1iCTYsiHbT+chyA0mY1Dmg3+Gl/Ij onPbGH/Tux/cJXyLn+65Lw= Received: from localhost.localdomain (unknown [123.149.2.202]) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wD3P+ihTvVmYf4FAA--.19120S4; Thu, 26 Sep 2024 20:08:03 +0800 (CST) From: Zhao Mengmeng To: jack@suse.com, zhaomengmeng@kylinos.cn Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] udf: refactor udf_next_aext() to handle error Date: Thu, 26 Sep 2024 20:07:52 +0800 Message-ID: <20240926120753.3639404-3-zhaomzhao@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240926120753.3639404-1-zhaomzhao@126.com> References: <20240926120753.3639404-1-zhaomzhao@126.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wD3P+ihTvVmYf4FAA--.19120S4 X-Coremail-Antispam: 1Uf129KBjvAXoWfJr4fJF4fZw1fKw13Cw1xZrb_yoW8AFW7Xo W5Aan0y3Z5XrWfAFW8C34UtFyUZ39akF4IyF4UurZ09w1xG3y5Xw1ag3W5Za47WrW0grWk Z34Igw45JF4kCws8n29KB7ZKAUJUUUU8529EdanIXcx71UUUUU7v73VFW2AGmfu7bjvjm3 AaLaJ3UbIYCTnIWIevJa73UjIFyTuYvjxUrg4SDUUUU X-CM-SenderInfo: 52kd0zp2kd0qqrswhudrp/1tbimglmd2b1SOY7RQAAsB Content-Type: text/plain; charset="utf-8" From: Zhao Mengmeng Since udf_current_aext() has error handling, udf_next_aext() should have error handling too. Besides, when too many indirect extents found in one inode, return -EFSCORRUPTED; when reading block failed, return -EIO. Signed-off-by: Zhao Mengmeng Suggested-by: Jan Kara --- fs/udf/balloc.c | 22 +++++++---- fs/udf/directory.c | 10 ++++- fs/udf/inode.c | 99 ++++++++++++++++++++++++++++++---------------- fs/udf/super.c | 3 +- fs/udf/truncate.c | 23 ++++++++--- fs/udf/udfdecl.h | 5 ++- 6 files changed, 110 insertions(+), 52 deletions(-) diff --git a/fs/udf/balloc.c b/fs/udf/balloc.c index d8fc11765d61..99cf8fbc805e 100644 --- a/fs/udf/balloc.c +++ b/fs/udf/balloc.c @@ -370,6 +370,7 @@ static void udf_table_free_blocks(struct super_block *s= b, struct extent_position oepos, epos; int8_t etype; struct udf_inode_info *iinfo; + int err =3D 0; =20 mutex_lock(&sbi->s_alloc_mutex); iinfo =3D UDF_I(table); @@ -384,7 +385,7 @@ static void udf_table_free_blocks(struct super_block *s= b, epos.bh =3D oepos.bh =3D NULL; =20 while (count && - (etype =3D udf_next_aext(table, &epos, &eloc, &elen, 1)) !=3D -1) { + !(err =3D udf_next_aext(table, &epos, &eloc, &elen, &etype, 1))) { if (((eloc.logicalBlockNum + (elen >> sb->s_blocksize_bits)) =3D=3D start)) { if ((0x3FFFFFFF - elen) < @@ -435,6 +436,9 @@ static void udf_table_free_blocks(struct super_block *s= b, } } =20 + if (UDF_EXT_ERR(err)) + goto error_return; + if (count) { /* * NOTE: we CANNOT use udf_add_aext here, as it can try to @@ -460,8 +464,6 @@ static void udf_table_free_blocks(struct super_block *s= b, else if (iinfo->i_alloc_type =3D=3D ICBTAG_FLAG_AD_LONG) adsize =3D sizeof(struct long_ad); else { - brelse(oepos.bh); - brelse(epos.bh); goto error_return; } =20 @@ -479,10 +481,10 @@ static void udf_table_free_blocks(struct super_block = *sb, __udf_add_aext(table, &epos, &eloc, elen, 1); } =20 +error_return: brelse(epos.bh); brelse(oepos.bh); =20 -error_return: mutex_unlock(&sbi->s_alloc_mutex); return; } @@ -498,6 +500,7 @@ static int udf_table_prealloc_blocks(struct super_block= *sb, struct extent_position epos; int8_t etype =3D -1; struct udf_inode_info *iinfo; + int err =3D 0; =20 if (first_block >=3D sbi->s_partmaps[partition].s_partition_len) return 0; @@ -517,12 +520,15 @@ static int udf_table_prealloc_blocks(struct super_blo= ck *sb, eloc.logicalBlockNum =3D 0xFFFFFFFF; =20 while (first_block !=3D eloc.logicalBlockNum && - (etype =3D udf_next_aext(table, &epos, &eloc, &elen, 1)) !=3D -1) { + !(err =3D udf_next_aext(table, &epos, &eloc, &elen, &etype, 1))) { udf_debug("eloc=3D%u, elen=3D%u, first_block=3D%u\n", eloc.logicalBlockNum, elen, first_block); ; /* empty loop body */ } =20 + if (UDF_EXT_ERR(err)) + goto err_out; + if (first_block =3D=3D eloc.logicalBlockNum) { epos.offset -=3D adsize; =20 @@ -539,6 +545,7 @@ static int udf_table_prealloc_blocks(struct super_block= *sb, alloc_count =3D 0; } =20 +err_out: brelse(epos.bh); =20 if (alloc_count) @@ -560,6 +567,7 @@ static udf_pblk_t udf_table_new_block(struct super_bloc= k *sb, struct extent_position epos, goal_epos; int8_t etype; struct udf_inode_info *iinfo =3D UDF_I(table); + int ret =3D 0; =20 *err =3D -ENOSPC; =20 @@ -584,7 +592,7 @@ static udf_pblk_t udf_table_new_block(struct super_bloc= k *sb, epos.bh =3D goal_epos.bh =3D NULL; =20 while (spread && - (etype =3D udf_next_aext(table, &epos, &eloc, &elen, 1)) !=3D -1) { + !(ret =3D udf_next_aext(table, &epos, &eloc, &elen, &etype, 1))) { if (goal >=3D eloc.logicalBlockNum) { if (goal < eloc.logicalBlockNum + (elen >> sb->s_blocksize_bits)) @@ -612,7 +620,7 @@ static udf_pblk_t udf_table_new_block(struct super_bloc= k *sb, =20 brelse(epos.bh); =20 - if (spread =3D=3D 0xFFFFFFFF) { + if (UDF_EXT_ERR(ret) || spread =3D=3D 0xFFFFFFFF) { brelse(goal_epos.bh); mutex_unlock(&sbi->s_alloc_mutex); return 0; diff --git a/fs/udf/directory.c b/fs/udf/directory.c index 93153665eb37..82922a4ae425 100644 --- a/fs/udf/directory.c +++ b/fs/udf/directory.c @@ -166,13 +166,19 @@ static struct buffer_head *udf_fiiter_bread_blk(struc= t udf_fileident_iter *iter) */ static int udf_fiiter_advance_blk(struct udf_fileident_iter *iter) { + int8_t etype =3D -1; + int err =3D 0; + iter->loffset++; if (iter->loffset < DIV_ROUND_UP(iter->elen, 1<dir->i_blkbits)) return 0; =20 iter->loffset =3D 0; - if (udf_next_aext(iter->dir, &iter->epos, &iter->eloc, &iter->elen, 1) - !=3D (EXT_RECORDED_ALLOCATED >> 30)) { + err =3D udf_next_aext(iter->dir, &iter->epos, &iter->eloc, &iter->elen, + &etype, 1); + if (UDF_EXT_ERR(err)) + return err; + else if (UDF_EXT_EOF(err) || etype !=3D (EXT_RECORDED_ALLOCATED >> 30)) { if (iter->pos =3D=3D iter->dir->i_size) { iter->elen =3D 0; return 0; diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 3be59aa8d4fd..6c4f104e2bf7 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -545,6 +545,7 @@ static int udf_do_extend_file(struct inode *inode, } else { struct kernel_lb_addr tmploc; uint32_t tmplen; + int8_t tmptype; =20 udf_write_aext(inode, last_pos, &last_ext->extLocation, last_ext->extLength, 1); @@ -554,8 +555,12 @@ static int udf_do_extend_file(struct inode *inode, * more extents, we may need to enter possible following * empty indirect extent. */ - if (new_block_bytes) - udf_next_aext(inode, last_pos, &tmploc, &tmplen, 0); + if (new_block_bytes) { + err =3D udf_next_aext(inode, last_pos, &tmploc, &tmplen, + &tmptype, 0); + if (UDF_EXT_ERR(err)) + goto out_err; + } } iinfo->i_lenExtents +=3D add; =20 @@ -674,8 +679,10 @@ static int udf_extend_file(struct inode *inode, loff_t= newsize) extent.extLength =3D EXT_NOT_RECORDED_NOT_ALLOCATED; } else { epos.offset -=3D adsize; - etype =3D udf_next_aext(inode, &epos, &extent.extLocation, - &extent.extLength, 0); + err =3D udf_next_aext(inode, &epos, &extent.extLocation, + &extent.extLength, &etype, 0); + if (UDF_EXT_ERR(err)) + goto out; extent.extLength |=3D etype << 30; } =20 @@ -712,11 +719,11 @@ static int inode_getblk(struct inode *inode, struct u= df_map_rq *map) loff_t lbcount =3D 0, b_off =3D 0; udf_pblk_t newblocknum; sector_t offset =3D 0; - int8_t etype; + int8_t etype, tmpetype; struct udf_inode_info *iinfo =3D UDF_I(inode); udf_pblk_t goal =3D 0, pgoal =3D iinfo->i_location.logicalBlockNum; int lastblock =3D 0; - bool isBeyondEOF; + bool isBeyondEOF =3D false; int ret =3D 0; =20 prev_epos.offset =3D udf_file_entry_alloc_offset(inode); @@ -748,9 +755,12 @@ static int inode_getblk(struct inode *inode, struct ud= f_map_rq *map) prev_epos.offset =3D cur_epos.offset; cur_epos.offset =3D next_epos.offset; =20 - etype =3D udf_next_aext(inode, &next_epos, &eloc, &elen, 1); - if (etype =3D=3D -1) + ret =3D udf_next_aext(inode, &next_epos, &eloc, &elen, &etype, 1); + if (UDF_EXT_EOF(ret)) { + isBeyondEOF =3D true; break; + } else if (ret < 0) + goto out_free; =20 c =3D !c; =20 @@ -771,8 +781,12 @@ static int inode_getblk(struct inode *inode, struct ud= f_map_rq *map) * Move prev_epos and cur_epos into indirect extent if we are at * the pointer to it */ - udf_next_aext(inode, &prev_epos, &tmpeloc, &tmpelen, 0); - udf_next_aext(inode, &cur_epos, &tmpeloc, &tmpelen, 0); + ret =3D udf_next_aext(inode, &prev_epos, &tmpeloc, &tmpelen, &tmpetype, 0= ); + if (UDF_EXT_ERR(ret)) + goto out_free; + ret =3D udf_next_aext(inode, &cur_epos, &tmpeloc, &tmpelen, &tmpetype, 0); + if (UDF_EXT_ERR(ret)) + goto out_free; =20 /* if the extent is allocated and recorded, return the block if the extent is not a multiple of the blocksize, round up */ @@ -793,10 +807,9 @@ static int inode_getblk(struct inode *inode, struct ud= f_map_rq *map) } =20 /* Are we beyond EOF and preallocated extent? */ - if (etype =3D=3D -1) { + if (isBeyondEOF) { loff_t hole_len; =20 - isBeyondEOF =3D true; if (count) { if (c) laarr[0] =3D laarr[1]; @@ -832,7 +845,6 @@ static int inode_getblk(struct inode *inode, struct udf= _map_rq *map) endnum =3D c + 1; lastblock =3D 1; } else { - isBeyondEOF =3D false; endnum =3D startnum =3D ((count > 2) ? 2 : count); =20 /* if the current extent is in position 0, @@ -846,15 +858,17 @@ static int inode_getblk(struct inode *inode, struct u= df_map_rq *map) =20 /* if the current block is located in an extent, read the next extent */ - etype =3D udf_next_aext(inode, &next_epos, &eloc, &elen, 0); - if (etype !=3D -1) { + ret =3D udf_next_aext(inode, &next_epos, &eloc, &elen, &etype, 0); + if (!ret) { laarr[c + 1].extLength =3D (etype << 30) | elen; laarr[c + 1].extLocation =3D eloc; count++; startnum++; endnum++; - } else + } else if (UDF_EXT_EOF(ret)) lastblock =3D 1; + else + goto out_free; } =20 /* if the current extent is not recorded but allocated, get the @@ -1172,6 +1186,7 @@ static int udf_update_extents(struct inode *inode, st= ruct kernel_long_ad *laarr, int start =3D 0, i; struct kernel_lb_addr tmploc; uint32_t tmplen; + int8_t tmpetype; int err; =20 if (startnum > endnum) { @@ -1189,14 +1204,19 @@ static int udf_update_extents(struct inode *inode, = struct kernel_long_ad *laarr, */ if (err < 0) return err; - udf_next_aext(inode, epos, &laarr[i].extLocation, - &laarr[i].extLength, 1); + err =3D udf_next_aext(inode, epos, &laarr[i].extLocation, + &laarr[i].extLength, &tmpetype, 1); + if (UDF_EXT_ERR(err)) + return err; start++; } } =20 for (i =3D start; i < endnum; i++) { - udf_next_aext(inode, epos, &tmploc, &tmplen, 0); + err =3D udf_next_aext(inode, epos, &tmploc, &tmplen, &tmpetype, 0); + if (UDF_EXT_ERR(err)) + return err; + udf_write_aext(inode, epos, &laarr[i].extLocation, laarr[i].extLength, 1); } @@ -2168,15 +2188,15 @@ void udf_write_aext(struct inode *inode, struct ext= ent_position *epos, */ #define UDF_MAX_INDIR_EXTS 16 =20 -int8_t udf_next_aext(struct inode *inode, struct extent_position *epos, - struct kernel_lb_addr *eloc, uint32_t *elen, int inc) +int udf_next_aext(struct inode *inode, struct extent_position *epos, + struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype, + int inc) { - int8_t etype; unsigned int indirections =3D 0; int err =3D 0; =20 - while ((err =3D udf_current_aext(inode, epos, eloc, elen, &etype, inc))) { - if (err || etype !=3D (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) + while ((err =3D udf_current_aext(inode, epos, eloc, elen, etype, inc))) { + if (err || *etype !=3D (EXT_NEXT_EXTENT_ALLOCDESCS >> 30)) break; =20 udf_pblk_t block; @@ -2185,7 +2205,7 @@ int8_t udf_next_aext(struct inode *inode, struct exte= nt_position *epos, udf_err(inode->i_sb, "too many indirect extents in inode %lu\n", inode->i_ino); - return -1; + return -EFSCORRUPTED; } =20 epos->block =3D *eloc; @@ -2195,11 +2215,11 @@ int8_t udf_next_aext(struct inode *inode, struct ex= tent_position *epos, epos->bh =3D sb_bread(inode->i_sb, block); if (!epos->bh) { udf_debug("reading block %u failed!\n", block); - return -1; + return -EIO; } } =20 - return !err ? etype : -1; + return err; } =20 int udf_current_aext(struct inode *inode, struct extent_position *epos, @@ -2267,12 +2287,14 @@ static int udf_insert_aext(struct inode *inode, str= uct extent_position epos, if (epos.bh) get_bh(epos.bh); =20 - while ((etype =3D udf_next_aext(inode, &epos, &oeloc, &oelen, 0)) !=3D -1= ) { + while (!(err =3D udf_next_aext(inode, &epos, &oeloc, + &oelen, &etype, 0))) { udf_write_aext(inode, &epos, &neloc, nelen, 1); neloc =3D oeloc; nelen =3D (etype << 30) | oelen; } - err =3D udf_add_aext(inode, &epos, &neloc, nelen, 1); + if (UDF_EXT_EOF(err)) + err =3D udf_add_aext(inode, &epos, &neloc, nelen, 1); brelse(epos.bh); =20 return err; @@ -2287,6 +2309,7 @@ int8_t udf_delete_aext(struct inode *inode, struct ex= tent_position epos) struct udf_inode_info *iinfo; struct kernel_lb_addr eloc; uint32_t elen; + int err =3D 0; =20 if (epos.bh) { get_bh(epos.bh); @@ -2302,10 +2325,11 @@ int8_t udf_delete_aext(struct inode *inode, struct = extent_position epos) adsize =3D 0; =20 oepos =3D epos; - if (udf_next_aext(inode, &epos, &eloc, &elen, 1) =3D=3D -1) + err =3D udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1); + if (UDF_EXT_ERR(err)) return -1; =20 - while ((etype =3D udf_next_aext(inode, &epos, &eloc, &elen, 1)) !=3D -1) { + while (!(err =3D udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1))) { udf_write_aext(inode, &oepos, &eloc, (etype << 30) | elen, 1); if (oepos.bh !=3D epos.bh) { oepos.block =3D epos.block; @@ -2315,6 +2339,11 @@ int8_t udf_delete_aext(struct inode *inode, struct e= xtent_position epos) oepos.offset =3D epos.offset - adsize; } } + if (UDF_EXT_ERR(err)) { + brelse(epos.bh); + brelse(oepos.bh); + return -1; + } memset(&eloc, 0x00, sizeof(struct kernel_lb_addr)); elen =3D 0; =20 @@ -2370,6 +2399,7 @@ int8_t inode_bmap(struct inode *inode, sector_t block, loff_t lbcount =3D 0, bcount =3D (loff_t) block << blocksize_bits; int8_t etype; struct udf_inode_info *iinfo; + int err =3D 0; =20 iinfo =3D UDF_I(inode); if (!udf_read_extent_cache(inode, bcount, &lbcount, pos)) { @@ -2379,12 +2409,13 @@ int8_t inode_bmap(struct inode *inode, sector_t blo= ck, } *elen =3D 0; do { - etype =3D udf_next_aext(inode, pos, eloc, elen, 1); - if (etype =3D=3D -1) { + err =3D udf_next_aext(inode, pos, eloc, elen, &etype, 1); + if (UDF_EXT_EOF(err)) { *offset =3D (bcount - lbcount) >> blocksize_bits; iinfo->i_lenExtents =3D lbcount; - return -1; } + if (err < 0) + return -1; lbcount +=3D *elen; } while (lbcount <=3D bcount); /* update extent cache */ diff --git a/fs/udf/super.c b/fs/udf/super.c index 3460ecc826d1..8c34224e1aee 100644 --- a/fs/udf/super.c +++ b/fs/udf/super.c @@ -2482,13 +2482,14 @@ static unsigned int udf_count_free_table(struct sup= er_block *sb, uint32_t elen; struct kernel_lb_addr eloc; struct extent_position epos; + int8_t etype; =20 mutex_lock(&UDF_SB(sb)->s_alloc_mutex); epos.block =3D UDF_I(table)->i_location; epos.offset =3D sizeof(struct unallocSpaceEntry); epos.bh =3D NULL; =20 - while (udf_next_aext(table, &epos, &eloc, &elen, 1) !=3D -1) + while (!udf_next_aext(table, &epos, &eloc, &elen, &etype, 1)) accum +=3D (elen >> table->i_sb->s_blocksize_bits); =20 brelse(epos.bh); diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c index 16db2613401d..af06f7101859 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c @@ -69,6 +69,7 @@ void udf_truncate_tail_extent(struct inode *inode) int8_t etype =3D -1, netype; int adsize; struct udf_inode_info *iinfo =3D UDF_I(inode); + int err =3D 0; =20 if (iinfo->i_alloc_type =3D=3D ICBTAG_FLAG_AD_IN_ICB || inode->i_size =3D=3D iinfo->i_lenExtents) @@ -85,7 +86,7 @@ void udf_truncate_tail_extent(struct inode *inode) BUG(); =20 /* Find the last extent in the file */ - while ((netype =3D udf_next_aext(inode, &epos, &eloc, &elen, 1)) !=3D -1)= { + while (!(err =3D udf_next_aext(inode, &epos, &eloc, &elen, &netype, 1))) { etype =3D netype; lbcount +=3D elen; if (lbcount > inode->i_size) { @@ -101,7 +102,7 @@ void udf_truncate_tail_extent(struct inode *inode) epos.offset -=3D adsize; extent_trunc(inode, &epos, &eloc, etype, elen, nelen); epos.offset +=3D adsize; - if (udf_next_aext(inode, &epos, &eloc, &elen, 1) !=3D -1) + if (!udf_next_aext(inode, &epos, &eloc, &elen, &netype, 1)) udf_err(inode->i_sb, "Extent after EOF in inode %u\n", (unsigned)inode->i_ino); @@ -110,7 +111,8 @@ void udf_truncate_tail_extent(struct inode *inode) } /* This inode entry is in-memory only and thus we don't have to mark * the inode dirty */ - iinfo->i_lenExtents =3D inode->i_size; + if (UDF_EXT_EOF(err)) + iinfo->i_lenExtents =3D inode->i_size; brelse(epos.bh); } =20 @@ -124,6 +126,8 @@ void udf_discard_prealloc(struct inode *inode) int8_t etype =3D -1; struct udf_inode_info *iinfo =3D UDF_I(inode); int bsize =3D i_blocksize(inode); + int8_t tmpetype =3D -1; + int err =3D 0; =20 if (iinfo->i_alloc_type =3D=3D ICBTAG_FLAG_AD_IN_ICB || ALIGN(inode->i_size, bsize) =3D=3D ALIGN(iinfo->i_lenExtents, bsize)) @@ -132,16 +136,22 @@ void udf_discard_prealloc(struct inode *inode) epos.block =3D iinfo->i_location; =20 /* Find the last extent in the file */ - while (udf_next_aext(inode, &epos, &eloc, &elen, 0) !=3D -1) { + while (!(err =3D udf_next_aext(inode, &epos, &eloc, &elen, &tmpetype, + 0))) { brelse(prev_epos.bh); prev_epos =3D epos; if (prev_epos.bh) get_bh(prev_epos.bh); =20 - etype =3D udf_next_aext(inode, &epos, &eloc, &elen, 1); + err =3D udf_next_aext(inode, &epos, &eloc, &elen, &etype, 1); + if (err < 0) + break; lbcount +=3D elen; } - if (etype =3D=3D (EXT_NOT_RECORDED_ALLOCATED >> 30)) { + if (UDF_EXT_ERR(err)) + goto out; + + if (!err && etype =3D=3D (EXT_NOT_RECORDED_ALLOCATED >> 30)) { lbcount -=3D elen; udf_delete_aext(inode, prev_epos); udf_free_blocks(inode->i_sb, inode, &eloc, 0, @@ -150,6 +160,7 @@ void udf_discard_prealloc(struct inode *inode) /* This inode entry is in-memory only and thus we don't have to mark * the inode dirty */ iinfo->i_lenExtents =3D lbcount; +out: brelse(epos.bh); brelse(prev_epos.bh); } diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index a902652450dd..206077da9968 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -172,8 +172,9 @@ extern int udf_add_aext(struct inode *, struct extent_p= osition *, extern void udf_write_aext(struct inode *, struct extent_position *, struct kernel_lb_addr *, uint32_t, int); extern int8_t udf_delete_aext(struct inode *, struct extent_position); -extern int8_t udf_next_aext(struct inode *, struct extent_position *, - struct kernel_lb_addr *, uint32_t *, int); +extern int udf_next_aext(struct inode *inode, struct extent_position *epos, + struct kernel_lb_addr *eloc, uint32_t *elen, + int8_t *etype, int inc); extern int udf_current_aext(struct inode *inode, struct extent_position *e= pos, struct kernel_lb_addr *eloc, uint32_t *elen, int8_t *etype, int inc); --=20 2.43.0 From nobody Thu Nov 28 22:44:35 2024 Received: from m16.mail.126.com (m16.mail.126.com [220.197.31.6]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 3A03314F9FD for ; Thu, 26 Sep 2024 12:08:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.6 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727352502; cv=none; b=Z2BrQJc3joJCTbndCM3JmEdrCg+tX+mdBg4TlAKTR+5PHRxD7s77UOtE03Cw7HnW9c8Q8b49Xg8tHwF2AlD1d+2QwWgHVAY5CuWklviaZke54bMd2SbqNjqs/Is3aSaCzfNIkPVv/S/mMXdSYiCgHcdbxQTKUGnRf3AqJYIw/G4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1727352502; c=relaxed/simple; bh=90LRmv33v7TFDcoqTqqk0m5qenGojYQWD4buTFXUGTM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q58t8fuTp8trnv7yLcqJ+QRW28dNqBkPRyfBfSBmkl7G1XUrlGFBFZC1dJJCm2aSA7iD5PiYuJRWgUMYRfsdJN7O9nxQE/fPGwr9Aa0A0behGNNGMOU0o9L/tQa5so6ebW2xnd54JFAV1/8ltsdIRUPAgeZj3fVN9E+eLVsGp08= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com; spf=pass smtp.mailfrom=126.com; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b=O4icN9kS; arc=none smtp.client-ip=220.197.31.6 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=126.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=126.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=126.com header.i=@126.com header.b="O4icN9kS" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=126.com; s=s110527; h=From:Subject:Date:Message-ID:MIME-Version; bh=COwbb HNK6umIK0MrnLDcZHu2dGbVjHVmuS26XPzQiHU=; b=O4icN9kSm95kqTEZ8upTD a7TvyBPFwePC9ZfWJ3M1+VdkfN/X+1ndV5Dhep2hkgBvzcdVl2Fhjz8Q4boaR6z5 OLNSIclmReKeD6GP+ekn93GqsBdlZEYA+bH/baZTLDzFES6uNoXpaI9dRgaHqH7I OgA/BuXMT3k8saopKuDTH8= Received: from localhost.localdomain (unknown [123.149.2.202]) by gzga-smtp-mtada-g0-3 (Coremail) with SMTP id _____wD3P+ihTvVmYf4FAA--.19120S5; Thu, 26 Sep 2024 20:08:07 +0800 (CST) From: Zhao Mengmeng To: jack@suse.com, zhaomengmeng@kylinos.cn Cc: linux-kernel@vger.kernel.org Subject: [PATCH v2 3/3] udf: refactor inode_bmap() to handle error Date: Thu, 26 Sep 2024 20:07:53 +0800 Message-ID: <20240926120753.3639404-4-zhaomzhao@126.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240926120753.3639404-1-zhaomzhao@126.com> References: <20240926120753.3639404-1-zhaomzhao@126.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: _____wD3P+ihTvVmYf4FAA--.19120S5 X-Coremail-Antispam: 1Uf129KBjvJXoW3Wr4rAr4UtFykGr15uFyDZFb_yoW3XFy7pr 9rKa42kr4rXrWxWF4IqF1kZw1Fga92kr47GrWxu34SyFWvgr1rKFy0yry29Fn8KF4rCa12 qa15K3y5uw17JrJanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDUYxBIdaVFxhVjvjDU0xZFpf9x07jncTQUUUUU= X-CM-SenderInfo: 52kd0zp2kd0qqrswhudrp/1tbi6AZmd2b1Sv8nqwAAsV Content-Type: text/plain; charset="utf-8" From: Zhao Mengmeng Refactor inode_bmap() to handle error since udf_next_aext() can return error now. On situations like ftruncate, udf_extend_file() can now detect errors and bail out early without resorting to checking for particular offsets and assuming internal behavior of these functions. Reported-by: syzbot+7a4842f0b1801230a989@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=3D7a4842f0b1801230a989 Tested-by: syzbot+7a4842f0b1801230a989@syzkaller.appspotmail.com Signed-off-by: Zhao Mengmeng Suggested-by: Jan Kara --- fs/udf/directory.c | 13 ++++++++----- fs/udf/inode.c | 29 ++++++++++++++++++----------- fs/udf/partition.c | 6 ++++-- fs/udf/truncate.c | 8 +++++--- fs/udf/udfdecl.h | 5 +++-- 5 files changed, 38 insertions(+), 23 deletions(-) diff --git a/fs/udf/directory.c b/fs/udf/directory.c index 82922a4ae425..4b8bb77eaffa 100644 --- a/fs/udf/directory.c +++ b/fs/udf/directory.c @@ -246,6 +246,7 @@ int udf_fiiter_init(struct udf_fileident_iter *iter, st= ruct inode *dir, { struct udf_inode_info *iinfo =3D UDF_I(dir); int err =3D 0; + int8_t etype; =20 iter->dir =3D dir; iter->bh[0] =3D iter->bh[1] =3D NULL; @@ -265,9 +266,9 @@ int udf_fiiter_init(struct udf_fileident_iter *iter, st= ruct inode *dir, goto out; } =20 - if (inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos, - &iter->eloc, &iter->elen, &iter->loffset) !=3D - (EXT_RECORDED_ALLOCATED >> 30)) { + err =3D inode_bmap(dir, iter->pos >> dir->i_blkbits, &iter->epos, &iter->= eloc, + &iter->elen, &iter->loffset, &etype); + if (err || etype !=3D (EXT_RECORDED_ALLOCATED >> 30)) { if (pos =3D=3D dir->i_size) return 0; udf_err(dir->i_sb, @@ -463,6 +464,7 @@ int udf_fiiter_append_blk(struct udf_fileident_iter *it= er) sector_t block; uint32_t old_elen =3D iter->elen; int err; + int8_t etype; =20 if (WARN_ON_ONCE(iinfo->i_alloc_type =3D=3D ICBTAG_FLAG_AD_IN_ICB)) return -EINVAL; @@ -477,8 +479,9 @@ int udf_fiiter_append_blk(struct udf_fileident_iter *it= er) udf_fiiter_update_elen(iter, old_elen); return err; } - if (inode_bmap(iter->dir, block, &iter->epos, &iter->eloc, &iter->elen, - &iter->loffset) !=3D (EXT_RECORDED_ALLOCATED >> 30)) { + err =3D inode_bmap(iter->dir, block, &iter->epos, &iter->eloc, &iter->ele= n, + &iter->loffset, &etype); + if (err || etype !=3D (EXT_RECORDED_ALLOCATED >> 30)) { udf_err(iter->dir->i_sb, "block %llu not allocated in directory (ino %lu)\n", (unsigned long long)block, iter->dir->i_ino); diff --git a/fs/udf/inode.c b/fs/udf/inode.c index 6c4f104e2bf7..be9356f0eecf 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -418,10 +418,11 @@ static int udf_map_block(struct inode *inode, struct = udf_map_rq *map) uint32_t elen; sector_t offset; struct extent_position epos =3D {}; + int8_t etype; =20 down_read(&iinfo->i_data_sem); - if (inode_bmap(inode, map->lblk, &epos, &eloc, &elen, &offset) - =3D=3D (EXT_RECORDED_ALLOCATED >> 30)) { + err =3D inode_bmap(inode, map->lblk, &epos, &eloc, &elen, &offset, &etyp= e); + if (!err && etype =3D=3D (EXT_RECORDED_ALLOCATED >> 30)) { map->pblk =3D udf_get_lb_pblock(inode->i_sb, &eloc, offset); map->oflags |=3D UDF_BLK_MAPPED; @@ -664,8 +665,10 @@ static int udf_extend_file(struct inode *inode, loff_t= newsize) */ udf_discard_prealloc(inode); =20 - etype =3D inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset); - within_last_ext =3D (etype !=3D -1); + err =3D inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset, &ety= pe); + if (UDF_EXT_ERR(err)) + goto out; + within_last_ext =3D (!err); /* We don't expect extents past EOF... */ WARN_ON_ONCE(within_last_ext && elen > ((loff_t)offset + 1) << inode->i_blkbits); @@ -2391,13 +2394,17 @@ int8_t udf_delete_aext(struct inode *inode, struct = extent_position epos) return (elen >> 30); } =20 -int8_t inode_bmap(struct inode *inode, sector_t block, - struct extent_position *pos, struct kernel_lb_addr *eloc, - uint32_t *elen, sector_t *offset) +/* + * return 0 when iudf_next_aext() loop success. + * return err < 0 and err !=3D -ENODATA indicates error. + * return err =3D=3D -ENODATA indicates hit EOF. + */ +int inode_bmap(struct inode *inode, sector_t block, struct extent_position= *pos, + struct kernel_lb_addr *eloc, uint32_t *elen, sector_t *offset, + int8_t *etype) { unsigned char blocksize_bits =3D inode->i_sb->s_blocksize_bits; loff_t lbcount =3D 0, bcount =3D (loff_t) block << blocksize_bits; - int8_t etype; struct udf_inode_info *iinfo; int err =3D 0; =20 @@ -2409,18 +2416,18 @@ int8_t inode_bmap(struct inode *inode, sector_t blo= ck, } *elen =3D 0; do { - err =3D udf_next_aext(inode, pos, eloc, elen, &etype, 1); + err =3D udf_next_aext(inode, pos, eloc, elen, etype, 1); if (UDF_EXT_EOF(err)) { *offset =3D (bcount - lbcount) >> blocksize_bits; iinfo->i_lenExtents =3D lbcount; } if (err < 0) - return -1; + return err; lbcount +=3D *elen; } while (lbcount <=3D bcount); /* update extent cache */ udf_update_extent_cache(inode, lbcount - *elen, pos); *offset =3D (bcount + *elen - lbcount) >> blocksize_bits; =20 - return etype; + return 0; } diff --git a/fs/udf/partition.c b/fs/udf/partition.c index af877991edc1..c441d4ae1f96 100644 --- a/fs/udf/partition.c +++ b/fs/udf/partition.c @@ -282,9 +282,11 @@ static uint32_t udf_try_read_meta(struct inode *inode,= uint32_t block, sector_t ext_offset; struct extent_position epos =3D {}; uint32_t phyblock; + int8_t etype; + int err =3D 0; =20 - if (inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset) !=3D - (EXT_RECORDED_ALLOCATED >> 30)) + err =3D inode_bmap(inode, block, &epos, &eloc, &elen, &ext_offset, &etype= ); + if (err || etype !=3D (EXT_RECORDED_ALLOCATED >> 30)) phyblock =3D 0xFFFFFFFF; else { map =3D &UDF_SB(sb)->s_partmaps[partition]; diff --git a/fs/udf/truncate.c b/fs/udf/truncate.c index af06f7101859..d13ba9fd1309 100644 --- a/fs/udf/truncate.c +++ b/fs/udf/truncate.c @@ -208,10 +208,12 @@ int udf_truncate_extents(struct inode *inode) else BUG(); =20 - etype =3D inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset); + err =3D inode_bmap(inode, first_block, &epos, &eloc, &elen, &offset, &ety= pe); byte_offset =3D (offset << sb->s_blocksize_bits) + - (inode->i_size & (sb->s_blocksize - 1)); - if (etype =3D=3D -1) { + (inode->i_size & (sb->s_blocksize - 1)); + if (UDF_EXT_ERR(err)) + return err; + if (UDF_EXT_EOF(err)) { /* We should extend the file? */ WARN_ON(byte_offset); return 0; diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 206077da9968..a156ed95189a 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -160,8 +160,9 @@ extern struct buffer_head *udf_bread(struct inode *inod= e, udf_pblk_t block, extern int udf_setsize(struct inode *, loff_t); extern void udf_evict_inode(struct inode *); extern int udf_write_inode(struct inode *, struct writeback_control *wbc); -extern int8_t inode_bmap(struct inode *, sector_t, struct extent_position = *, - struct kernel_lb_addr *, uint32_t *, sector_t *); +extern int inode_bmap(struct inode *inode, sector_t block, + struct extent_position *pos, struct kernel_lb_addr *eloc, + uint32_t *elen, sector_t *offset, int8_t *etype); int udf_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int udf_setup_indirect_aext(struct inode *inode, udf_pblk_t block, struct extent_position *epos); --=20 2.43.0