isofs: validate directory records in NFS get_parent
Subsystems (2)
PATCH 1/1 isofs: validate directory records in NFS get_parent
isofs_export_get_parent() assumes valid "." and ".." entries.
A malformed image can provide an invalid length for the first entry.
Validate both records before using the first length as the ".." offset.
This keeps the NFS export get_parent path from accepting malformed records.
--- fs/isofs/export.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)
fs/isofs/export.c +29 -1
@@ -16,6 +16,26 @@#include "isofs.h" +static bool isofs_dir_record_valid (struct iso_directory_record *de, +unsigned long offset, +unsigned long bufsize) +{ +unsigned int len; +unsigned int name_len; +unsigned long min_len = offsetof(struct iso_directory_record , name); + +if (offset > bufsize || bufsize - offset < min_len) +return false; + + len =isonum_711 (de->length); + name_len =isonum_711 (de->name_len); +if (len < min_len || name_len > len - min_len) +return false; +if (len > bufsize - offset) +return false; +return true; +} +static struct dentry * isofs_export_iget(struct super_block *sb, unsigned long block,
@@ -83,13 +103,21 @@ static struct dentry *isofs_export_get_parent(struct dentry *child)/* This is the "." entry. */ de = (struct iso_directory_record *)bh->b_data; +if (!isofs_dir_record_valid (de,0 , child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=0 ) { +printk (KERN_ERR "isofs: Unable to find the \".\" directory for NFS.\n" ); + rv =ERR_PTR (-EACCES ); + goto out; + }/* The ".." entry is always the second entry. */ parent_offset = (unsigned long )isonum_711 (de->length); de = (struct iso_directory_record *)(bh->b_data + parent_offset);/* Verify it is in fact the ".." entry. */ -if ((isonum_711 (de->name_len) !=1 ) || (de->name[0 ] !=1 )) { +if (!isofs_dir_record_valid (de, parent_offset, + child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=1 ) {printk (KERN_ERR "isofs: Unable to find the \"..\" " "directory for NFS.\n" ); rv =ERR_PTR (-EACCES );
Signature · 1 line
2.51.0
Jan Kara
maintainerQuoted 9 lines · Yichong Chen
isofs_export_get_parent()assumes valid "." and ".." entries.A malformed image can provide an invalid length for the first entry.
Validate both records before using the first length as the ".." offset.
This keeps the NFS export
get_parentpath from accepting malformed records.Signed-off-by Yichong Chen <[email protected]>
This looks sensible. But for maintainability, can you please move isofs_dir_record_valid() to namei.c and make sure readdir and directory lookup functions are using this function for directory entry checking as well (and remove the duplicit checks there)? So that we have the same checks everywhere... Thanks.
Honza
Quoted 61 lines
--- fs/isofs/export.c | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-)fs/isofs/export.c +29
-1@@ -16,6 +16,26 @@#include "isofs.h" +static bool isofs_dir_record_valid (struct iso_directory_record *de, +unsigned long offset, +unsigned long bufsize) +{ +unsigned int len; +unsigned int name_len; +unsigned long min_len = offsetof(struct iso_directory_record , name); + +if (offset > bufsize || bufsize - offset < min_len) +return false; + + len =isonum_711 (de->length); + name_len =isonum_711 (de->name_len); +if (len < min_len || name_len > len - min_len) +return false; +if (len > bufsize - offset) +return false; +return true; +} +static struct dentry * isofs_export_iget(struct super_block *sb, unsigned long block,@@ -83,13 +103,21 @@ static struct dentry *isofs_export_get_parent(struct dentry *child)/* This is the "." entry. */ de = (struct iso_directory_record *)bh->b_data; +if (!isofs_dir_record_valid (de,0 , child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=0 ) { +printk (KERN_ERR "isofs: Unable to find the \".\" directory for NFS.\n" ); + rv =ERR_PTR (-EACCES ); + goto out; + }/* The ".." entry is always the second entry. */ parent_offset = (unsigned long )isonum_711 (de->length); de = (struct iso_directory_record *)(bh->b_data + parent_offset);/* Verify it is in fact the ".." entry. */ -if ((isonum_711 (de->name_len) !=1 ) || (de->name[0 ] !=1 )) { +if (!isofs_dir_record_valid (de, parent_offset, + child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=1 ) {printk (KERN_ERR "isofs: Unable to find the \"..\" " "directory for NFS.\n" ); rv =ERR_PTR (-EACCES );Signature · 1 line
2.51.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR
Thanks for the review. I'll rework it as suggested and send a v2.
Yichong
PATCH v2 1/1 isofs: validate directory records consistently
In reply to Jan Karaisofs_export_get_parent() assumes that the first two directory records are valid "." and ".." entries. A malformed image can provide an invalid length for the first entry, causing the computed ".." offset to point outside the received block.
Add a shared directory record validator and use it in NFS get_parent, readdir and lookup. This keeps the basic directory record length checks consistent across all directory users before they consume the name field or use one record length to find the next entry.
---
v2:
- Move the directory record validator to namei.c.
- Share the validator with NFS get_parent, readdir and lookup.
- Replace duplicate directory record length checks.
fs/isofs/dir.c | 7 ++----- fs/isofs/export.c | 10 +++++++++- fs/isofs/isofs.h | 3 +++ fs/isofs/namei.c | 28 ++++++++++++++++++++++++---- 4 files changed, 38 insertions(+), 10 deletions(-)
fs/isofs/dir.c +2 -5
@@ -149,10 +149,8 @@ static int do_isofs_readdir(struct inode *inode, struct file *file, } de = tmpde; } -/* Basic sanity check, whether name doesn't exceed dir entry */ -if (de_len <sizeof (struct iso_directory_record ) || - de_len < de->name_len[0 ] + -sizeof (struct iso_directory_record )) { +if (!isofs_dir_record_valid (de, de == tmpde ?0 : offset_saved, + de == tmpde ? de_len : bufsize)) {printk (KERN_NOTICE "iso9660: Corrupted directory entry" " in block %lu of inode %llu\n" , block, inode->i_ino);
@@ -300,4 +298,3 @@ const struct inode_operations isofs_dir_inode_operations = .fileattr_get = isofs_fileattr_get, }; -
fs/isofs/export.c +9 -1
@@ -83,13 +83,21 @@ static struct dentry *isofs_export_get_parent(struct dentry *child)/* This is the "." entry. */ de = (struct iso_directory_record *)bh->b_data; +if (!isofs_dir_record_valid (de,0 , child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=0 ) { +printk (KERN_ERR "isofs: Unable to find the \".\" directory for NFS.\n" ); + rv =ERR_PTR (-EACCES ); + goto out; + }/* The ".." entry is always the second entry. */ parent_offset = (unsigned long )isonum_711 (de->length); de = (struct iso_directory_record *)(bh->b_data + parent_offset);/* Verify it is in fact the ".." entry. */ -if ((isonum_711 (de->name_len) !=1 ) || (de->name[0 ] !=1 )) { +if (!isofs_dir_record_valid (de, parent_offset, + child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=1 ) {printk (KERN_ERR "isofs: Unable to find the \"..\" " "directory for NFS.\n" ); rv =ERR_PTR (-EACCES );
fs/isofs/isofs.h +3 -0
@@ -115,6 +115,9 @@ struct inode; /* To make gcc happy */extern int parse_rock_ridge_inode (struct iso_directory_record *,struct inode *,int relocated);extern int get_rock_ridge_filename (struct iso_directory_record *,char *,struct inode *);extern int isofs_name_translate (struct iso_directory_record *,char *,struct inode *); +bool isofs_dir_record_valid (struct iso_directory_record *de, +unsigned long offset, +unsigned long bufsize);int get_joliet_filename (struct iso_directory_record *,unsigned char *,struct inode *);int get_acorn_filename (struct iso_directory_record *,char *,struct inode *);
fs/isofs/namei.c +24 -4
@@ -10,6 +10,26 @@#include <linux/gfp.h> #include "isofs.h" +bool isofs_dir_record_valid (struct iso_directory_record *de, +unsigned long offset, +unsigned long bufsize) +{ +unsigned int len; +unsigned int name_len; +unsigned long min_len = offsetof(struct iso_directory_record , name); + +if (offset > bufsize || bufsize - offset < min_len) +return false; + + len =isonum_711 (de->length); + name_len =isonum_711 (de->name_len); +if (len < min_len || name_len > len - min_len) +return false; +if (len > bufsize - offset) +return false; +return true; +} +static int isofs_cmp (struct dentry *dentry,const char *compare,int dlen) {
@@ -88,16 +108,16 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, de = tmpde; } - dlen = de->name_len[0 ]; - dpnt = de->name; -/* Basic sanity check, whether name doesn't exceed dir entry */ -if (de_len < dlen +sizeof (struct iso_directory_record )) { +if (!isofs_dir_record_valid (de, de == tmpde ?0 : offset_saved, + de == tmpde ? de_len : bufsize)) {printk (KERN_NOTICE "iso9660: Corrupted directory entry" " in block %lu of inode %llu\n" , block, dir->i_ino);brelse (bh);return 0 ; } + dlen = de->name_len[0 ]; + dpnt = de->name;if (sbi->s_rock && ((i =get_rock_ridge_filename (de, tmpname, dir)))) {
Signature · 1 line
2.51.0
Jan Kara
maintainerRe: [PATCH v2] isofs: validate directory records consistently
Quoted 11 lines · Yichong Chen
isofs_export_get_parent()assumes that the first two directory records are valid "." and ".." entries. A malformed image can provide an invalid length for the first entry, causing the computed ".." offset to point outside the received block.Add a shared directory record validator and use it in NFS
get_parent, readdir and lookup. This keeps the basic directory record length checks consistent across all directory users before they consume the name field or use one record length to find the next entry.Signed-off-by Yichong Chen <[email protected]>
Thanks! I've merged this patch to my tree.
Honza
Quoted 129 lines
---
v2:
- Move the directory record validator tonamei.c.
- Share the validator with NFSget_parent, readdir and lookup.
- Replace duplicate directory record length checks.fs/isofs/dir.c | 7 ++----- fs/isofs/export.c | 10 +++++++++- fs/isofs/isofs.h | 3 +++ fs/isofs/namei.c | 28 ++++++++++++++++++++++++---- 4 files changed, 38 insertions(+), 10 deletions(-)fs/isofs/dir.c +2
-5@@ -149,10 +149,8 @@ static int do_isofs_readdir(struct inode *inode, struct file *file, } de = tmpde; } -/* Basic sanity check, whether name doesn't exceed dir entry */ -if (de_len <sizeof (struct iso_directory_record ) || - de_len < de->name_len[0 ] + -sizeof (struct iso_directory_record )) { +if (!isofs_dir_record_valid (de, de == tmpde ?0 : offset_saved, + de == tmpde ? de_len : bufsize)) {printk (KERN_NOTICE "iso9660: Corrupted directory entry" " in block %lu of inode %llu\n" , block, inode->i_ino);@@ -300,4 +298,3 @@ const struct inode_operations isofs_dir_inode_operations = .fileattr_get = isofs_fileattr_get, }; -fs/isofs/export.c +9
-1@@ -83,13 +83,21 @@ static struct dentry *isofs_export_get_parent(struct dentry *child)/* This is the "." entry. */ de = (struct iso_directory_record *)bh->b_data; +if (!isofs_dir_record_valid (de,0 , child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=0 ) { +printk (KERN_ERR "isofs: Unable to find the \".\" directory for NFS.\n" ); + rv =ERR_PTR (-EACCES ); + goto out; + }/* The ".." entry is always the second entry. */ parent_offset = (unsigned long )isonum_711 (de->length); de = (struct iso_directory_record *)(bh->b_data + parent_offset);/* Verify it is in fact the ".." entry. */ -if ((isonum_711 (de->name_len) !=1 ) || (de->name[0 ] !=1 )) { +if (!isofs_dir_record_valid (de, parent_offset, + child_inode->i_sb->s_blocksize) || +isonum_711 (de->name_len) !=1 || de->name[0 ] !=1 ) {printk (KERN_ERR "isofs: Unable to find the \"..\" " "directory for NFS.\n" ); rv =ERR_PTR (-EACCES );fs/isofs/isofs.h +3
-0@@ -115,6 +115,9 @@ struct inode; /* To make gcc happy */extern int parse_rock_ridge_inode (struct iso_directory_record *,struct inode *,int relocated);extern int get_rock_ridge_filename (struct iso_directory_record *,char *,struct inode *);extern int isofs_name_translate (struct iso_directory_record *,char *,struct inode *); +bool isofs_dir_record_valid (struct iso_directory_record *de, +unsigned long offset, +unsigned long bufsize);int get_joliet_filename (struct iso_directory_record *,unsigned char *,struct inode *);int get_acorn_filename (struct iso_directory_record *,char *,struct inode *);fs/isofs/namei.c +24
-4@@ -10,6 +10,26 @@#include <linux/gfp.h> #include "isofs.h" +bool isofs_dir_record_valid (struct iso_directory_record *de, +unsigned long offset, +unsigned long bufsize) +{ +unsigned int len; +unsigned int name_len; +unsigned long min_len = offsetof(struct iso_directory_record , name); + +if (offset > bufsize || bufsize - offset < min_len) +return false; + + len =isonum_711 (de->length); + name_len =isonum_711 (de->name_len); +if (len < min_len || name_len > len - min_len) +return false; +if (len > bufsize - offset) +return false; +return true; +} +static int isofs_cmp (struct dentry *dentry,const char *compare,int dlen) {@@ -88,16 +108,16 @@ isofs_find_entry(struct inode *dir, struct dentry *dentry, de = tmpde; } - dlen = de->name_len[0 ]; - dpnt = de->name; -/* Basic sanity check, whether name doesn't exceed dir entry */ -if (de_len < dlen +sizeof (struct iso_directory_record )) { +if (!isofs_dir_record_valid (de, de == tmpde ?0 : offset_saved, + de == tmpde ? de_len : bufsize)) {printk (KERN_NOTICE "iso9660: Corrupted directory entry" " in block %lu of inode %llu\n" , block, dir->i_ino);brelse (bh);return 0 ; } + dlen = de->name_len[0 ]; + dpnt = de->name;if (sbi->s_rock && ((i =get_rock_ridge_filename (de, tmpname, dir)))) {Signature · 1 line
2.51.0
Signature · 2 lines
Jan Kara <[email protected]> SUSE Labs, CR