diff options
| author | Vegard Nossum <vegard.nossum@oracle.com> | 2015-12-11 15:54:16 +0100 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2016-02-24 10:29:51 +0100 |
| commit | ac79eb71083136ce2690777051e5e4d88a6639f0 (patch) | |
| tree | abf7096ecdcd244b9aec6d0df52ed4c3f9513676 | |
| parent | d92f52252bd94d8c33631ca6d00d0eb5d2ef416a (diff) | |
| download | lwn-ac79eb71083136ce2690777051e5e4d88a6639f0.tar.gz lwn-ac79eb71083136ce2690777051e5e4d88a6639f0.zip | |
udf: limit the maximum number of indirect extents in a row
commit b0918d9f476a8434b055e362b83fa4fd1d462c3f upstream.
udf_next_aext() just follows extent pointers while extents are marked as
indirect. This can loop forever for corrupted filesystem. Limit number
the of indirect extents we are willing to follow in a row.
[JK: Updated changelog, limit, style]
Signed-off-by: Vegard Nossum <vegard.nossum@oracle.com>
Cc: Jan Kara <jack@suse.com>
Cc: Quentin Casasnovas <quentin.casasnovas@oracle.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
| -rw-r--r-- | fs/udf/inode.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/fs/udf/inode.c b/fs/udf/inode.c index b0774f245199..b6b2958ba758 100644 --- a/fs/udf/inode.c +++ b/fs/udf/inode.c @@ -2069,14 +2069,29 @@ void udf_write_aext(struct inode *inode, struct extent_position *epos, epos->offset += adsize; } +/* + * Only 1 indirect extent in a row really makes sense but allow upto 16 in case + * someone does some weird stuff. + */ +#define UDF_MAX_INDIR_EXTS 16 + int8_t udf_next_aext(struct inode *inode, struct extent_position *epos, struct kernel_lb_addr *eloc, uint32_t *elen, int inc) { int8_t etype; + unsigned int indirections = 0; while ((etype = udf_current_aext(inode, epos, eloc, elen, inc)) == (EXT_NEXT_EXTENT_ALLOCDECS >> 30)) { int block; + + if (++indirections > UDF_MAX_INDIR_EXTS) { + udf_err(inode->i_sb, + "too many indirect extents in inode %lu\n", + inode->i_ino); + return -1; + } + epos->block = *eloc; epos->offset = sizeof(struct allocExtDesc); brelse(epos->bh); |