stm class: Replace kmalloc + copy_from_user with memdup_user
Subsystems (3)
PATCH RESEND 1/2 stm class: Replace kmalloc + copy_from_user with memdup_user
Replace kmalloc() followed by copy_from_user() with memdup_user() to simplify and improve stm_char_write().
Allocate and copy only 'count' bytes instead of 'count + 1' since the extra byte is unused.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/hwtracing/stm/core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)
drivers/hwtracing/stm/core.c +3 -9
@@ -645,15 +645,9 @@ static ssize_t stm_char_write(struct file *file, const char __user *buf,return err; } - kbuf =kmalloc (count +1 ,GFP_KERNEL ); -if (!kbuf) -return -ENOMEM ; - - err =copy_from_user (kbuf, buf, count); -if (err) { -kfree (kbuf); -return -EFAULT ; - } + kbuf =memdup_user (buf, count); +if (IS_ERR (kbuf)) +return PTR_ERR (kbuf);pm_runtime_get_sync (&stm->dev);
PATCH RESEND 2/2 stm class: Replace kzalloc + copy_from_user with memdup_user_nul
Replace kzalloc() followed by copy_from_user() with memdup_user_nul() to simplify and improve stm_char_policy_set_ioctl(). Remove the obsolete comment.
Signed-off-by Thorsten Blum <[email protected]>
--- drivers/hwtracing/stm/core.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-)
drivers/hwtracing/stm/core.c +3 -12
@@ -733,18 +733,9 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg)if (size <sizeof (*id) || size >=PATH_MAX +sizeof (*id))return -EINVAL ; -/* -* size + 1 to make sure the .id string at the bottom is terminated, -* which is also why memdup_user() is not useful here -*/ - id =kzalloc (size +1 ,GFP_KERNEL ); -if (!id) -return -ENOMEM ; - -if (copy_from_user (id, arg, size)) { - ret = -EFAULT ; - goto err_free; - } + id =memdup_user_nul (arg, size); +if (IS_ERR (id)) +return PTR_ERR (id);if (id->__reserved_0 || id->__reserved_1) goto err_free;
Gentle ping?
Quoted 34 lines · Thorsten Blum
Replace
kmalloc()followed bycopy_from_user()withmemdup_user()to simplify and improvestm_char_write().Allocate and copy only 'count' bytes instead of 'count + 1' since the extra byte is unused.
Signed-off-by Thorsten Blum <[email protected]>--- drivers/hwtracing/stm/core.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-)drivers/hwtracing/stm/core.c +3
-9@@ -645,15 +645,9 @@ static ssize_t stm_char_write(struct file *file, const char __user *buf,return err; } - kbuf =kmalloc (count +1 ,GFP_KERNEL ); -if (!kbuf) -return -ENOMEM ; - - err =copy_from_user (kbuf, buf, count); -if (err) { -kfree (kbuf); -return -EFAULT ; - } + kbuf =memdup_user (buf, count); +if (IS_ERR (kbuf)) +return PTR_ERR (kbuf);pm_runtime_get_sync (&stm->dev);