rsxx: Fix potential NULL dereference setting up debugfs
Subsystems (2)
PATCH 1/2 rsxx: Fix potential NULL dereference setting up debugfs
The "card->gendisk" pointer is allocated in rsxx_setup_dev() but there is a module option "enable_blkdev" which lets people disable the block device. In that situation the "card->gendisk" pointer is NULL and it would lead to a NULL dereference here.
---
This patch is from static analysis. The patch is obviously harmless. So far as I can tell, the bug is real. But maybe a different solution is prefered?
drivers/block/rsxx/core.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/block/rsxx/core.c +3 -0
@@ -228,6 +228,9 @@ static void rsxx_debugfs_dev_new(struct rsxx_cardinfo *card)struct dentry *debugfs_pci_regs;struct dentry *debugfs_cram; +if (!card->gendisk) +return ; + card->debugfs_dir =debugfs_create_dir (card->gendisk->disk_name,NULL );if (IS_ERR_OR_NULL (card->debugfs_dir)) goto failed_debugfs_dir;
Signature · 1 line
2.26.2
PATCH 2/2 rsxx: Return -EFAULT if copy_to_user() fails
The copy_to_user() function returns the number of bytes remaining but we want to return -EFAULT to the user if it can't complete the copy. The "st" variable only holds zero on success or negative error codes on failure so the type should be int.
--- drivers/block/rsxx/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/block/rsxx/core.c +5 -3
@@ -165,15 +165,17 @@ static ssize_t rsxx_cram_read(struct file *fp, char __user *ubuf, {struct rsxx_cardinfo *card =file_inode (fp)->i_private;char *buf; -ssize_t st; +int st; buf =kzalloc (cnt,GFP_KERNEL );if (!buf)return -ENOMEM ; st =rsxx_creg_read (card,CREG_ADD_CRAM + (u32)*ppos, cnt, buf,1 ); -if (!st) - st =copy_to_user (ubuf, buf, cnt); +if (!st) { +if (copy_to_user (ubuf, buf, cnt)) + st = -EFAULT ; + }kfree (buf);if (st)return st;
Signature · 1 line
2.26.2
PATCH RESEND 1/1 rsxx: Return -EFAULT if copy_to_user() fails
In reply to Dan CarpenterThe copy_to_user() function returns the number of bytes remaining but we want to return -EFAULT to the user if it can't complete the copy. The "st" variable only holds zero on success or negative error codes on failure so the type should be int.
---
I sent this last June as part of a 2 patch series. No one responded to the patches. The first patch was a NULL derefence fix but I now think that the correct fix for that is to remove the "enable_blkdev" module option... Anyway, this patch is uncontroversial so I'm going to resend it.
drivers/block/rsxx/core.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/block/rsxx/core.c +5 -3
@@ -165,15 +165,17 @@ static ssize_t rsxx_cram_read(struct file *fp, char __user *ubuf, {struct rsxx_cardinfo *card =file_inode (fp)->i_private;char *buf; -ssize_t st; +int st; buf =kzalloc (cnt,GFP_KERNEL );if (!buf)return -ENOMEM ; st =rsxx_creg_read (card,CREG_ADD_CRAM + (u32)*ppos, cnt, buf,1 ); -if (!st) - st =copy_to_user (ubuf, buf, cnt); +if (!st) { +if (copy_to_user (ubuf, buf, cnt)) + st = -EFAULT ; + }kfree (buf);if (st)return st;
Signature · 1 line
2.26.2
Jens Axboe
maintainerRe: [PATCH RESEND] rsxx: Return -EFAULT if copy_to_user() fails
Quoted 5 lines · Dan Carpenter
The
copy_to_user()function returns the number of bytes remaining but we want to return-EFAULTto the user if it can't complete the copy. The "st" variable only holds zero on success or negative error codes on failure so the type should be int.
Quoted 8 lines
Fixes 36f988e978f8 ("rsxx: Adding in debugfs entries.")Signed-off-by Dan Carpenter <[email protected]>---
I sent this last June as part of a 2 patch series. No one responded to the patches. The first patch was a NULL derefence fix but I now think that the correct fix for that is to remove the "enable_blkdev" module option... Anyway, this patch is uncontroversial so I'm going to resend it.
Thanks Dan, applied.
Signature · 1 line
Jens Axboe