summaryrefslogtreecommitdiffstats
path: root/fs/isofs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-12-16 15:46:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-16 15:46:01 -0800
commit31f48fc8f226f968d6e6b9b9718abe8e16c51fe8 (patch)
treeb2f990f32448b097ec418d37c173483ebab18f54 /fs/isofs
parent0b233b7c79d2ba92c7fb5d60d4116693f1b3b0fe (diff)
parentf54e18f1b831c92f6512d2eedb224cd63d607d3d (diff)
downloadlinux-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.tar.gz
linux-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.tar.bz2
linux-31f48fc8f226f968d6e6b9b9718abe8e16c51fe8.zip
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull isofs and reiserfs fixes from Jan Kara: "A reiserfs and an isofs fix. They arrived after I sent you my first pull request and I don't want to delay them unnecessarily till rc2" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: isofs: Fix infinite looping over CE entries reiserfs: destroy allocated commit workqueue
Diffstat (limited to 'fs/isofs')
-rw-r--r--fs/isofs/rock.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c
index f488bbae541a..bb63254ed848 100644
--- a/fs/isofs/rock.c
+++ b/fs/isofs/rock.c
@@ -30,6 +30,7 @@ struct rock_state {
int cont_size;
int cont_extent;
int cont_offset;
+ int cont_loops;
struct inode *inode;
};
@@ -73,6 +74,9 @@ static void init_rock_state(struct rock_state *rs, struct inode *inode)
rs->inode = inode;
}
+/* Maximum number of Rock Ridge continuation entries */
+#define RR_MAX_CE_ENTRIES 32
+
/*
* Returns 0 if the caller should continue scanning, 1 if the scan must end
* and -ve on error.
@@ -105,6 +109,8 @@ static int rock_continue(struct rock_state *rs)
goto out;
}
ret = -EIO;
+ if (++rs->cont_loops >= RR_MAX_CE_ENTRIES)
+ goto out;
bh = sb_bread(rs->inode->i_sb, rs->cont_extent);
if (bh) {
memcpy(rs->buffer, bh->b_data + rs->cont_offset,