Skip to contentSkip to conversation

2.6.20.4 fix kernel panic on corrupted reiserfs directory

PATCH In review lepton 2 participants 3 messages Apr 5, 2007

lore
Share & tools
lore

lepton

author
#0 lore raw

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
diff -pru linux-2.6/fs/reiserfs/dir.c linux-2.6-lepton/fs/reiserfs/dir.c
@@ -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

#1 lore raw
Quoted 5 lines · lepton

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)

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

diff -pru linux-2.6/fs/reiserfs/dir.c linux-2.6-lepton/fs/reiserfs/dir.c

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

author
#2 lore raw

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_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)

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

diff -pru linux-2.6/fs/reiserfs/dir.c linux-2.6-lepton/fs/reiserfs/dir.c

fs/reiserfs/dir.c +0 -0

14: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