2.6.20.4 fix kernel panic on corrupted reiserfs directory
PATCH 1/1 2.6.20.4 fix kernel panic on corrupted reiserfs directory
Hi,
When reading corrupted reiserfs directory data, d_reclen could be a negative number, then memcpy will overflow kernel stack. This can lead to kernel panic.
The following patch adds a sanity check. (against 2.6.20.4)
fs/reiserfs/dir.c +5 -0
@@ -121,6 +121,11 @@ static int reiserfs_readdir(struct file/* it is hidden entry */ continue ; d_reclen =entry_length (bh, ih, entry_num); +if (d_reclen <0 ) { +pathrelse (&path_to_entry); + ret = -EIO ; + goto out; + } d_name =B_I_DEH_ENTRY_FILE_NAME (bh, ih, deh);if (!d_name[d_reclen -1 ]) d_reclen =strlen (d_name);
O
Quoted 5 lines · lepton
Hi,
When reading corrupted reiserfs directory data,d_reclencould be a negative number, then memcpy will overflow kernel stack. This can lead to kernel panic.
The following patch adds a sanity check. (against 2.6.20.4)
Is it possible to get a large positive number here due to other fs corruption and bypass your sanity check? If I read the code correctly, this would still oops in the "if" statement just below the part you patched.
Quoted 18 lines
Signed-off-by Lepton Wu <[email protected]>diff -pru
linux-2.6/fs/reiserfs/dir.clinux-2.6-lepton/fs/reiserfs/dir.cfs/reiserfs/dir.c +5
-0@@ -121,6 +121,11 @@ static int reiserfs_readdir(struct file/* it is hidden entry */ continue ; d_reclen =entry_length (bh, ih, entry_num); +if (d_reclen <0 ) { +pathrelse (&path_to_entry); + ret = -EIO ; + goto out; + } d_name =B_I_DEH_ENTRY_FILE_NAME (bh, ih, deh);if (!d_name[d_reclen -1 ]) d_reclen =strlen (d_name);O
Yes, you are right.
I need more work on my trival patch.
Quoted 31 lines · Alexander E. Patrakov
Quoted 5 lines · lepton
Hi,
When reading corrupted reiserfs directory data,d_reclencould be a negative number, then memcpy will overflow kernel stack. This can lead to kernel panic.
The following patch adds a sanity check. (against 2.6.20.4)Is it possible to get a large positive number here due to other fs corruption and bypass your sanity check? If I read the code correctly, this would still oops in the "if" statement just below the part you patched.
Quoted 20 lines
Signed-off-by Lepton Wu <[email protected]>diff -pru
linux-2.6/fs/reiserfs/dir.clinux-2.6-lepton/fs/reiserfs/dir.cfs/reiserfs/dir.c +0
-014:35:58.000000000 +0800
fs/reiserfs/dir.c +5
-0@@ -121,6 +121,11 @@ static int reiserfs_readdir(struct file/* it is hidden entry */ continue ; d_reclen =entry_length (bh, ih, entry_num); +if (d_reclen <0 ) { +pathrelse (&path_to_entry); + ret = -EIO ; + goto out; + } d_name =B_I_DEH_ENTRY_FILE_NAME (bh, ih, deh);if (!d_name[d_reclen -1 ])d_reclen = strlen(d_name);O