proc: use vmalloc for our kernel buffer
Subsystems (14)
PATCH v3 1/2 proc: use vmalloc for our kernel buffer
Since
sysctl: pass kernel pointers to ->proc_handler
we have been pre-allocating a buffer to copy the data from the proc handlers into, and then copying that to userspace. The problem is this just blind kmalloc()'s the buffer size passed in from the read, which in the case of our 'cat' binary was 64kib. Order-4 allocations are not awesome, and since we can potentially allocate up to our maximum order, use vmalloc for these buffers.
---v2->v3:
- Rename vmemdup_user_nul to kvmemdup_user_nul.v1->v2:
- Make vmemdup_user_nul actually do the right thing...sorry about that.
fs/proc/proc_sysctl.c | 6 +++--- include/linux/string.h | 1 + mm/util.c | 27 +++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-)
fs/proc/proc_sysctl.c +3 -3
@@ -571,13 +571,13 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, goto out;if (write) { - kbuf =memdup_user_nul (ubuf, count); + kbuf =kvmemdup_user_nul (ubuf, count);if (IS_ERR (kbuf)) { error =PTR_ERR (kbuf); goto out; } }else { - kbuf =kzalloc (count,GFP_KERNEL ); + kbuf =kvzalloc (count,GFP_KERNEL );if (!kbuf) goto out; }
@@ -600,7 +600,7 @@ static ssize_t proc_sys_call_handler(struct file *filp, void __user *ubuf, error = count; out_free_buf: -kfree (kbuf); +kvfree (kbuf); out:sysctl_head_finish (head);
include/linux/string.h +1 -0
@@ -12,6 +12,7 @@extern char *strndup_user (const char __user *,long );extern void *memdup_user (const void __user *,size_t );extern void *vmemdup_user (const void __user *,size_t ); +extern void *kvmemdup_user_nul (const void __user *,size_t );extern void *memdup_user_nul (const void __user *,size_t );/*
mm/util.c +27 -0
@@ -208,6 +208,33 @@ void *vmemdup_user(const void __user *src, size_t len) }EXPORT_SYMBOL (vmemdup_user); +/** +* kvmemdup_user_nul - duplicate memory region from user space and NUL-terminate +* +* @src: source address in user space +* @len: number of bytes to copy +* +* Return: an ERR_PTR() on failure. Result may be not +* physically contiguous. Use kvfree() to free. +*/ +void *kvmemdup_user_nul (const void __user *src,size_t len) +{ +char *p; + + p =kvmalloc (len +1 ,GFP_USER ); +if (!p) +return ERR_PTR (-ENOMEM ); + +if (copy_from_user (p, src, len)) { +kvfree (p); +return ERR_PTR (-EFAULT ); + } + p[len] ='\0' ; + +return p; +} +EXPORT_SYMBOL (kvmemdup_user_nul); +/** * strndup_user - duplicate an existing string from user space * @s: The string to duplicate
Signature · 1 line
2.24.1
PATCH 2/2 tree-wide: rename vmemdup_user to kvmemdup_user
This helper uses kvmalloc, not vmalloc, so rename it to kvmemdup_user to make it clear we're using kvmalloc() and will need to use kvfree().
--- arch/x86/kvm/cpuid.c | 6 +++--- drivers/gpu/drm/virtio/virtgpu_ioctl.c | 2 +- drivers/tty/vt/consolemap.c | 2 +- include/linux/string.h | 2 +- mm/util.c | 6 +++--- sound/core/control.c | 4 ++-- virt/kvm/kvm_main.c | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-)
arch/x86/kvm/cpuid.c +3 -3
@@ -200,9 +200,9 @@ int kvm_vcpu_ioctl_set_cpuid(struct kvm_vcpu *vcpu,if (cpuid->nent >KVM_MAX_CPUID_ENTRIES ) goto out;if (cpuid->nent) { - cpuid_entries =vmemdup_user (entries, -array_size (sizeof (struct kvm_cpuid_entry ), - cpuid->nent)); + cpuid_entries =kvmemdup_user (entries, +array_size (sizeof (struct kvm_cpuid_entry ), + cpuid->nent));if (IS_ERR (cpuid_entries)) { r =PTR_ERR (cpuid_entries); goto out;
drivers/gpu/drm/virtio/virtgpu_ioctl.c +1 -1
@@ -147,7 +147,7 @@ static int virtio_gpu_execbuffer_ioctl(struct drm_device *dev, void *data, bo_handles =NULL ; } - buf =vmemdup_user (u64_to_user_ptr (exbuf->command), exbuf->size); + buf =kvmemdup_user (u64_to_user_ptr (exbuf->command), exbuf->size);if (IS_ERR (buf)) { ret =PTR_ERR (buf); goto out_unused_fd;
drivers/tty/vt/consolemap.c +1 -1
@@ -542,7 +542,7 @@ int con_set_unimap(struct vc_data *vc, ushort ct, struct unipair __user *list)if (!ct)return 0 ; - unilist =vmemdup_user (list,array_size (sizeof (struct unipair ), ct)); + unilist =kvmemdup_user (list,array_size (sizeof (struct unipair ), ct));if (IS_ERR (unilist))return PTR_ERR (unilist);
include/linux/string.h +1 -1
@@ -11,7 +11,7 @@extern char *strndup_user (const char __user *,long );extern void *memdup_user (const void __user *,size_t ); -extern void *vmemdup_user (const void __user *,size_t ); +extern void *kvmemdup_user (const void __user *,size_t );extern void *kvmemdup_user_nul (const void __user *,size_t );extern void *memdup_user_nul (const void __user *,size_t );
mm/util.c +3 -3
@@ -183,7 +183,7 @@ void *memdup_user(const void __user *src, size_t len)EXPORT_SYMBOL (memdup_user);/** -* vmemdup_user - duplicate memory region from user space +* kvmemdup_user - duplicate memory region from user space * * @src: source address in user space * @len: number of bytes to copy
@@ -191,7 +191,7 @@ EXPORT_SYMBOL(memdup_user);* Return: an ERR_PTR() on failure. Result may be not * physically contiguous. Use kvfree() to free. */ -void *vmemdup_user (const void __user *src,size_t len) +void *kvmemdup_user (const void __user *src,size_t len) {void *p;
@@ -206,7 +206,7 @@ void *vmemdup_user(const void __user *src, size_t len)return p; } -EXPORT_SYMBOL (vmemdup_user); +EXPORT_SYMBOL (kvmemdup_user);/** * kvmemdup_user_nul - duplicate memory region from user space and NUL-terminate
sound/core/control.c +2 -2
@@ -1297,7 +1297,7 @@ static int replace_user_tlv(struct snd_kcontrol *kctl, unsigned int __user *buf,if (size >1024 *128 )/* sane value */ return -EINVAL ; - container =vmemdup_user (buf, size); + container =kvmemdup_user (buf, size);if (IS_ERR (container))return PTR_ERR (container);
@@ -1365,7 +1365,7 @@ static int snd_ctl_elem_init_enum_names(struct user_element *ue)if (ue->info.value.enumerated.names_length >64 *1024 )return -EINVAL ; - names =vmemdup_user ((const void __user *)user_ptrval, + names =kvmemdup_user ((const void __user *)user_ptrval, ue->info.value.enumerated.names_length);if (IS_ERR (names))return PTR_ERR (names);
virt/kvm/kvm_main.c +2 -2
@@ -3814,8 +3814,8 @@ static long kvm_vm_ioctl(struct file *filp, goto out;if (routing.nr) { urouting = argp; - entries =vmemdup_user (urouting->entries, -array_size (sizeof (*entries), + entries =kvmemdup_user (urouting->entries, +array_size (sizeof (*entries), routing.nr));if (IS_ERR (entries)) { r =PTR_ERR (entries);
Signature · 1 line
2.24.1
kernel test robot
build botRe: [PATCH 2/2] tree-wide: rename vmemdup_user to kvmemdup_user
I love your patch! Perhaps something to improve:
Hi Josef,
I love your patch! Perhaps something to improve:
[auto build test WARNING on kvm/linux-next]
[also build test WARNING on linus/master next-20200813] [cannot apply to hnaz-linux-mm/master hch-configfs/for-next v5.8] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Josef-Bacik/proc-use-vmalloc-for-our-kernel-buffer/20200814-001519 base: https://git.kernel.org/pub/scm/virt/kvm/kvm.git linux-next config: s390-randconfig-c004-20200813 (attached as .config) compiler: s390-linux-gcc (GCC) 9.3.0
If you fix the issue, kindly add following tag as appropriate
coccinelle warnings: (new ones prefixed by >>)
>> mm/util.c:198:5-13: WARNING opportunity for vmemdup_user
Please review and possibly fold the followup patch.
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org
kernel test robot
build bot[PATCH] tree-wide: fix memdup_user.cocci warnings
In reply to Josef Bacikmm/util.c:198:5-13: WARNING opportunity for vmemdup_user
From: kernel test robot <[email protected]>
mm/util.c:198:5-13: WARNING opportunity for vmemdup_user
Use memdup_user rather than duplicating its implementation This is a little bit restricted to reduce false positives
Generated by: scripts/coccinelle/api/memdup_user.cocci
---
url: https://github.com/0day-ci/linux/commits/Josef-Bacik/proc-use-vmalloc-for-our-kernel-buffer/20200814-001519 base: https://git.kernel.org/pub/scm/virt/kvm/kvm.git linux-next
Please take the patch only if it's a positive warning. Thanks!
util.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-)
mm/util.c +3 -8
@@ -195,14 +195,9 @@ void *kvmemdup_user(const void __user *s {void *p; - p =kvmalloc (len,GFP_USER ); -if (!p) -return ERR_PTR (-ENOMEM ); - -if (copy_from_user (p, src, len)) { -kvfree (p); -return ERR_PTR (-EFAULT ); - } + p =vmemdup_user (src, len); +if (IS_ERR (p)) +return ERR_PTR (PTR_ERR (p));return p; }