scsi: scsi_debug: Replace kzalloc() + copy_from_user() with memdup_user_nul()
PATCH 1/1 scsi: scsi_debug: Replace kzalloc() + copy_from_user() with memdup_user_nul()
Replace kzalloc() followed by copy_from_user() with memdup_user_nul() to improve and simplify sdebug_error_write().
No functional changes intended.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/scsi/scsi_debug.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
drivers/scsi/scsi_debug.c +3 -8
@@ -1155,14 +1155,9 @@ static ssize_t sdebug_error_write(struct file *file, const char __user *ubuf,struct sdebug_err_inject *inject;struct scsi_device *sdev = (struct scsi_device *)file->f_inode->i_private; - buf =kzalloc (count +1 ,GFP_KERNEL ); -if (!buf) -return -ENOMEM ; - -if (copy_from_user (buf, ubuf, count)) { -kfree (buf); -return -EFAULT ; - } + buf =memdup_user_nul (ubuf, count); +if (IS_ERR (buf)) +return PTR_ERR (buf);if (buf[0 ] =='-' )return sdebug_err_remove (sdev, buf, count);
Signature · 1 line
2.51.0
Quoted 2 lines · Thorsten Blum
Replace
kzalloc()followed bycopy_from_user()withmemdup_user_nul()to improve and simplifysdebug_error_write().
Reviewed-by Bart Van Assche <[email protected]>
Martin K. Petersen
AppliedThorsten,
Quoted 2 lines
Replace
kzalloc()followed bycopy_from_user()withmemdup_user_nul()to improve and simplifysdebug_error_write().
Applied to 6.18/scsi-staging, thanks!
Signature · 1 line
Martin K. Petersen