Commit 88a89037 authored by Al Viro's avatar Al Viro

replace_user_tlv(): switch to vmemdup_user()

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 50fd2f29
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/mm.h>
#include <linux/sched/signal.h> #include <linux/sched/signal.h>
#include <sound/core.h> #include <sound/core.h>
#include <sound/minors.h> #include <sound/minors.h>
...@@ -1129,7 +1130,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf, ...@@ -1129,7 +1130,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
if (size > 1024 * 128) /* sane value */ if (size > 1024 * 128) /* sane value */
return -EINVAL; return -EINVAL;
container = memdup_user(buf, size); container = vmemdup_user(buf, size);
if (IS_ERR(container)) if (IS_ERR(container))
return PTR_ERR(container); return PTR_ERR(container);
...@@ -1137,7 +1138,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf, ...@@ -1137,7 +1138,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
if (!change) if (!change)
change = memcmp(ue->tlv_data, container, size) != 0; change = memcmp(ue->tlv_data, container, size) != 0;
if (!change) { if (!change) {
kfree(container); kvfree(container);
return 0; return 0;
} }
...@@ -1148,7 +1149,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf, ...@@ -1148,7 +1149,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,
mask = SNDRV_CTL_EVENT_MASK_INFO; mask = SNDRV_CTL_EVENT_MASK_INFO;
} }
kfree(ue->tlv_data); kvfree(ue->tlv_data);
ue->tlv_data = container; ue->tlv_data = container;
ue->tlv_data_size = size; ue->tlv_data_size = size;
...@@ -1225,7 +1226,7 @@ static void snd_ctl_elem_user_free(struct snd_kcontrol *kcontrol) ...@@ -1225,7 +1226,7 @@ static void snd_ctl_elem_user_free(struct snd_kcontrol *kcontrol)
{ {
struct user_element *ue = kcontrol->private_data; struct user_element *ue = kcontrol->private_data;
kfree(ue->tlv_data); kvfree(ue->tlv_data);
kfree(ue->priv_data); kfree(ue->priv_data);
kfree(ue); kfree(ue);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment