mm/memblock: validate the creation of debugfs files
Subsystems (4)
PATCH 1/1 mm/memblock: validate the creation of debugfs files
Signed-off-by Alexander Kuleshov <[email protected]>
--- mm/memblock.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
mm/memblock.c +21 -3
@@ -1692,16 +1692,34 @@ static const struct file_operations memblock_debug_fops = {static int __init memblock_init_debugfs (void ) { +struct dentry *f;struct dentry *root =debugfs_create_dir ("memblock" ,NULL );if (!root)return -ENXIO ; -debugfs_create_file ("memory" ,S_IRUGO , root, &memblock.memory, &memblock_debug_fops); -debugfs_create_file ("reserved" ,S_IRUGO , root, &memblock.reserved, &memblock_debug_fops); + + f =debugfs_create_file ("memory" ,S_IRUGO , root, &memblock.memory, &memblock_debug_fops); +if (!f) { +pr_err ("Failed to create memory debugfs file\n" ); + goto err_out; + } + + f =debugfs_create_file ("reserved" ,S_IRUGO , root, &memblock.reserved, &memblock_debug_fops); +if (!f) { +pr_err ("Failed to create reserved debugfs file\n" ); + goto err_out; + } +#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP -debugfs_create_file ("physmem" ,S_IRUGO , root, &memblock.physmem, &memblock_debug_fops); + f =debugfs_create_file ("physmem" ,S_IRUGO , root, &memblock.physmem, &memblock_debug_fops); +if (!f) { +pr_err ("Failed to create physmem debugfs file\n" ); + goto err_out; + }#endif return 0 ; +err_out: +return -ENOMEM ; }__initcall (memblock_init_debugfs);
Signature · 1 line
2.5.0
PATCH 1/1 misc/mei: Fix debugfs filename in error output
Signed-off-by Alexander Kuleshov <[email protected]>
--- drivers/misc/mei/debugfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/misc/mei/debugfs.c +1 -1
@@ -207,7 +207,7 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name) f =debugfs_create_file ("active" ,S_IRUSR , dir, dev, &mei_dbgfs_fops_active);if (!f) { -dev_err (dev->dev,"meclients: registration failed\n" ); +dev_err (dev->dev,"active: registration failed\n" ); goto err; } f = debugfs_create_file("devstate", S_IRUSR, dir,
Signature · 1 line
2.5.0
Quoted 5 lines · Alexander Kuleshov
Signed-off-by Alexander Kuleshov <[email protected]>--- mm/memblock.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-)
Sorry for noise, skip the first patch please.