mm: add copy_remote_vm_str
Subsystems (6)
PATCH v4 1/3 mm: add copy_remote_vm_str
Similar to access_process_vm but specific to strings. Also chunks reads by page and utilizes strscpy for handling null termination.
--- include/linux/mm.h | 3 ++ mm/memory.c | 118 +++++++++++++++++++++++++++++++++++++++++++++ mm/nommu.c | 66 +++++++++++++++++++++++++ 3 files changed, 187 insertions(+)
include/linux/mm.h +3 -0
@@ -2485,6 +2485,9 @@ extern int access_process_vm(struct task_struct *tsk, unsigned long addr,extern int access_remote_vm (struct mm_struct *mm,unsigned long addr,void *buf,int len,unsigned int gup_flags); +extern int copy_remote_vm_str (struct task_struct *tsk,unsigned long addr, +void *buf,int len,unsigned int gup_flags); + long get_user_pages_remote(struct mm_struct *mm, unsigned long start, unsigned long nr_pages, unsigned int gup_flags, struct page **pages,
mm/memory.c +118 -0
124 lines not on this page · raw message
mm/nommu.c +66 -0
72 lines not on this page · raw message
--
2.43.5
PATCH v4 2/3 bpf: Add bpf_copy_from_user_task_str kfunc
This new kfunc will be able to copy a string from another process's/task's address space. This is similar to bpf_copy_from_user_str but accepts a struct task_struct* argument.
--- kernel/bpf/helpers.c | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+)
kernel/bpf/helpers.c +48 -0
@@ -3082,6 +3082,53 @@ __bpf_kfunc void bpf_local_irq_restore(unsigned long *flags__irq_flag)local_irq_restore (*flags__irq_flag); } +/** +* bpf_copy_from_user_task_str() - Copy a string from an task's address space +* @dst: Destination address, in kernel space. This buffer must be +* at least @dst__sz bytes long. +* @dst__sz: Maximum number of bytes to copy, includes the trailing NUL. +* @unsafe_ptr__ign: Source address in the task's address space. +* @tsk: The task whose address space will be used +* @flags: The only supported flag is BPF_F_PAD_ZEROS +* +* Copies a NUL terminated string from a task's address space to @dst__sz +* buffer. If user string is too long this will still ensure zero termination +* in the @dst__sz buffer unless buffer size is 0. +* +* If BPF_F_PAD_ZEROS flag is set, memset the tail of @dst__sz to 0 on success +* and memset all of @dst__sz on failure. +* +* Return: The number of copied bytes on success including the NUL terminator. +* A negative error code on failure. +*/ +__bpf_kfunc int bpf_copy_from_user_task_str(void *dst, +u32 dst__sz, +const void __user *unsafe_ptr__ign, +struct task_struct *tsk, +u64 flags) +{ +int ret; + +if (unlikely (flags & ~BPF_F_PAD_ZEROS )) +return -EINVAL ; + +if (unlikely (!dst__sz)) +return 0 ; + + ret =copy_remote_vm_str (tsk, (unsigned long )unsafe_ptr__ign, dst, dst__sz,0 ); + +if (ret <0 ) { +if (flags &BPF_F_PAD_ZEROS ) +memset (dst,0 , dst__sz); +return ret; + } + +if (flags &BPF_F_PAD_ZEROS ) +memset (dst + ret,0 , dst__sz - ret); + +return ret +1 ; +} +__bpf_kfunc_end_defs ();BTF_KFUNCS_START (generic_btf_ids)
@@ -3174,6 +3221,7 @@ BTF_ID_FLAGS(func, bpf_iter_bits_new, KF_ITER_NEW) BTF_ID_FLAGS(func, bpf_iter_bits_next, KF_ITER_NEXT | KF_RET_NULL) BTF_ID_FLAGS(func, bpf_iter_bits_destroy, KF_ITER_DESTROY) BTF_ID_FLAGS(func, bpf_copy_from_user_str, KF_SLEEPABLE) +BTF_ID_FLAGS(func, bpf_copy_from_user_task_str, KF_SLEEPABLE) BTF_ID_FLAGS(func, bpf_get_kmem_cache) BTF_ID_FLAGS(func, bpf_iter_kmem_cache_new, KF_ITER_NEW | KF_SLEEPABLE)BTF_ID_FLAGS (func, bpf_iter_kmem_cache_next,KF_ITER_NEXT |KF_RET_NULL |KF_SLEEPABLE )
--
2.43.5
PATCH v4 3/3 selftests/bpf: Add tests for bpf_copy_from_user_task_str
In reply to Jordan RomeThis adds tests for both the happy path and the error path (with and without the BPF_F_PAD_ZEROS flag).
--- .../selftests/bpf/prog_tests/bpf_iter.c | 68 +++++++++++ .../selftests/bpf/prog_tests/read_vsyscall.c | 1 + .../selftests/bpf/progs/bpf_iter_tasks.c | 110 ++++++++++++++++++ .../selftests/bpf/progs/read_vsyscall.c | 11 +- 4 files changed, 188 insertions(+), 2 deletions(-)
tools/testing/selftests/bpf/prog_tests/bpf_iter.c +68 -0
@@ -323,19 +323,87 @@ static void test_task_pidfd(void)static void test_task_sleepable (void ) {struct bpf_iter_tasks *skel; +int pid, status, err, data_pipe[2 ], finish_pipe[2 ], c; +char *test_data =NULL ; +char *test_data_long =NULL ; +char *data[2 ]; + +if (!ASSERT_OK (pipe (data_pipe),"data_pipe" ) || + !ASSERT_OK (pipe (finish_pipe),"finish_pipe" )) +return ; skel =bpf_iter_tasks__open_and_load ();if (!ASSERT_OK_PTR (skel,"bpf_iter_tasks__open_and_load" ))return ; + pid =fork (); +if (!ASSERT_GE (pid,0 ,"fork" )) +return ; + +if (pid ==0 ) { +/* child */ +close (data_pipe[0 ]); +close (finish_pipe[1 ]); + + test_data =malloc (sizeof (char ) *10 ); +strncpy (test_data,"test_data" ,10 ); + test_data[9 ] ='\0' ; + + test_data_long =malloc (sizeof (char ) *5000 ); +for (int i =0 ; i <5000 ; ++i) { +if (i %2 ==0 ) + test_data_long[i] ='b' ; +else + test_data_long[i] ='a' ; + } + test_data_long[4999 ] ='\0' ; + + data[0 ] = test_data; + data[1 ] = test_data_long; + +write (data_pipe[1 ], &data,sizeof (data)); + +/* keep child alive until after the test */ + err =read (finish_pipe[0 ], &c,1 ); +if (err !=1 ) +exit (-1 ); + +close (data_pipe[1 ]); +close (finish_pipe[0 ]); +_exit (0 ); + } + +/* parent */ +close (data_pipe[1 ]); +close (finish_pipe[0 ]); + + err =read (data_pipe[0 ], &data,sizeof (data)); +ASSERT_EQ (err,sizeof (data),"read_check" ); + + skel->bss->user_ptr = data[0 ]; + skel->bss->user_ptr_long = data[1 ]; + skel->bss->pid = pid; +do_dummy_read (skel->progs.dump_task_sleepable);ASSERT_GT (skel->bss->num_expected_failure_copy_from_user_task,0 ,"num_expected_failure_copy_from_user_task" );ASSERT_GT (skel->bss->num_success_copy_from_user_task,0 ,"num_success_copy_from_user_task" ); +ASSERT_GT (skel->bss->num_expected_failure_copy_from_user_task_str,0 , +"num_expected_failure_copy_from_user_task_str" ); +ASSERT_GT (skel->bss->num_success_copy_from_user_task_str,0 , +"num_success_copy_from_user_task_str" );bpf_iter_tasks__destroy (skel); + +write (finish_pipe[1 ], &c,1 ); + err =waitpid (pid, &status,0 ); +ASSERT_EQ (err, pid,"waitpid" ); +ASSERT_EQ (status,0 ,"zero_child_exit" ); + +close (data_pipe[0 ]); +close (finish_pipe[1 ]); }static void test_task_stack (void )
tools/testing/selftests/bpf/prog_tests/read_vsyscall.c +1 -0
@@ -24,6 +24,7 @@ struct read_ret_desc { { .name = "copy_from_user", .ret = -EFAULT }, { .name = "copy_from_user_task", .ret = -EFAULT }, { .name = "copy_from_user_str", .ret = -EFAULT }, + { .name = "copy_from_user_task_str", .ret = -EFAULT }, };void test_read_vsyscall (void )
tools/testing/selftests/bpf/progs/bpf_iter_tasks.c +110 -0
137 lines not on this page · raw message
tools/testing/selftests/bpf/progs/read_vsyscall.c +9 -2
@@ -8,14 +8,16 @@int target_pid =0 ;void *user_ptr =0 ; -int read_ret[9 ]; +int read_ret[10 ]; char _license[] SEC("license") = "GPL";/* -* This is the only kfunc, the others are helpers +* These are the kfuncs, the others are helpers */ int bpf_copy_from_user_str(void *dst, u32, const void *, u64) __weak __ksym; +int bpf_copy_from_user_task_str(void *dst, u32, const void *, + struct task_struct *, u64) __weak __ksym; SEC("fentry/" SYS_PREFIX "sys_nanosleep")int do_probe_read (void *ctx)
@@ -47,6 +49,11 @@ int do_copy_from_user(void *ctx) read_ret[7 ] =bpf_copy_from_user_task (buf,sizeof (buf), user_ptr,bpf_get_current_task_btf (),0 ); read_ret[8 ] =bpf_copy_from_user_str ((char *)buf,sizeof (buf), user_ptr,0 ); + read_ret[9 ] =bpf_copy_from_user_task_str ((char *)buf, +sizeof (buf), + user_ptr, +bpf_get_current_task_btf (), +0 );return 0 ; }
--
2.43.5
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Jordan,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
[also build test ERROR on bpf/master linus/master v6.13 next-20250124] [cannot apply to akpm-mm/mm-everything]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jordan-Rome/bpf-Add-bpf_copy_from_user_task_str-kfunc/20250126-204439 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20250126124147.3154108-1-linux%40jordanrome.com patch subject: [bpf-next v4 1/3] mm: add copy_remote_vm_str config: arm-allnoconfig (https://download.01.org/0day-ci/archive/20250126/[email protected]/config) compiler: clang version 17.0.6 (https://github.com/llvm/llvm-project 6009708b4367171ccdbf4b5905cb6a803753fe18) reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250126/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
>> mm/nommu.c:1717:2: error: use of undeclared identifier 'vma'
1717 | vma = find_vma(mm, addr);
| ^
mm/nommu.c:1718:6: error: use of undeclared identifier 'vma'; did you mean 'vmap'?
1718 | if (vma) {
| ^~~
| vmap
mm/nommu.c:303:15: note: 'vmap' declared here
303 | EXPORT_SYMBOL(vmap);
| ^
mm/nommu.c:1720:21: error: use of undeclared identifier 'vma'
1720 | if (addr + len >= vma->vm_end)
| ^
mm/nommu.c:1721:10: error: use of undeclared identifier 'vma'
1721 | len = vma->vm_end - addr;
| ^
mm/nommu.c:1724:7: error: use of undeclared identifier 'vma'
1724 | if (vma->vm_flags & VM_MAYREAD) {
| ^
>> mm/nommu.c:1725:23: error: incompatible integer to pointer conversion passing 'unsigned long' to parameter of type 'const char *' [-Wint-conversion]
1725 | ret = strscpy(buf, addr, len);
| ^~~~
include/linux/string.h:113:55: note: expanded from macro 'strscpy'
113 | CONCATENATE(__strscpy, COUNT_ARGS(__VA_ARGS__))(dst, src, __VA_ARGS__)
| ^~~
include/linux/string.h:82:21: note: expanded from macro '__strscpy1'
82 | sized_strscpy(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
| ^~~
include/linux/string.h:72:43: note: passing argument to parameter here
72 | ssize_t sized_strscpy(char *, const char *, size_t);
| ^6 errors generated.
vim +/vma +1717 mm/nommu.c
1703
1704 /*
1705 * Copy a string from another process's address space as given in mm.
1706 * If there is any error return -EFAULT.
1707 */
1708 static int __copy_remote_vm_str(struct mm_struct *mm, unsigned long addr,
1709 void *buf, int len)
1710 {
1711 int ret;
1712
1713 if (mmap_read_lock_killable(mm))
1714 return -EFAULT;
1715
1716 /* the access must start within one of the target process's mappings */
> 1717 vma = find_vma(mm, addr);
1718 if (vma) {
1719 /* don't overrun this mapping */
> 1720 if (addr + len >= vma->vm_end)
1721 len = vma->vm_end - addr;
1722
1723 /* only read mappings where it is permitted */
1724 if (vma->vm_flags & VM_MAYREAD) {
> 1725 ret = strscpy(buf, addr, len); 1726 if (ret < 0)
1727 ret = len - 1;
1728 } else {
1729 ret = -EFAULT;
1730 }
1731 } else {
1732 ret = -EFAULT;
1733 }
1734
1735 mmap_read_unlock(mm);
1736 return ret;
1737 }
1738
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
kernel test robot
build botkernel test robot noticed the following build errors:
Hi Jordan,
kernel test robot noticed the following build errors:
[auto build test ERROR on bpf-next/master]
[also build test ERROR on bpf/master linus/master v6.13 next-20250124] [cannot apply to akpm-mm/mm-everything]
[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#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Jordan-Rome/bpf-Add-bpf_copy_from_user_task_str-kfunc/20250126-204439 base: https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git master patch link: https://lore.kernel.org/r/20250126124147.3154108-1-linux%40jordanrome.com patch subject: [bpf-next v4 1/3] mm: add copy_remote_vm_str config: arm-randconfig-001-20250126 (https://download.01.org/0day-ci/archive/20250126/[email protected]/config) compiler: arm-linux-gnueabi-gcc (GCC) 14.2.0 reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250126/[email protected]/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-kbuild-all/[email protected]/
All errors (new ones prefixed by >>):
mm/nommu.c: In function '__copy_remote_vm_str':
>> mm/nommu.c:1717:9: error: 'vma' undeclared (first use in this function); did you mean 'vmap'?
1717 | vma = find_vma(mm, addr);
| ^~~
| vmap
mm/nommu.c:1717:9: note: each undeclared identifier is reported only once for each function it appears in
In file included from include/linux/bitmap.h:13,
from include/linux/cpumask.h:12,
from include/linux/smp.h:13,
from include/linux/lockdep.h:14,
from include/linux/spinlock.h:63,
from include/linux/mmzone.h:8,
from include/linux/gfp.h:7,
from include/linux/mm.h:7,
from mm/nommu.c:20:
>> mm/nommu.c:1725:44: error: passing argument 2 of 'sized_strscpy' makes pointer from integer without a cast [-Wint-conversion]
1725 | ret = strscpy(buf, addr, len);
| ^~~~
| |
| long unsigned int
include/linux/string.h:82:28: note: in definition of macro '__strscpy1'
82 | sized_strscpy(dst, src, size + __must_be_cstr(dst) + __must_be_cstr(src))
| ^~~
mm/nommu.c:1725:31: note: in expansion of macro 'strscpy'
1725 | ret = strscpy(buf, addr, len);
| ^~~~~~~
include/linux/string.h:72:31: note: expected 'const char *' but argument is of type 'long unsigned int'
72 | ssize_t sized_strscpy(char *, const char *, size_t);
| ^~~~~~~~~~~~vim +1717 mm/nommu.c
1703
1704 /*
1705 * Copy a string from another process's address space as given in mm.
1706 * If there is any error return -EFAULT.
1707 */
1708 static int __copy_remote_vm_str(struct mm_struct *mm, unsigned long addr,
1709 void *buf, int len)
1710 {
1711 int ret;
1712
1713 if (mmap_read_lock_killable(mm))
1714 return -EFAULT;
1715
1716 /* the access must start within one of the target process's mappings */
> 1717 vma = find_vma(mm, addr);
1718 if (vma) {
1719 /* don't overrun this mapping */
1720 if (addr + len >= vma->vm_end)
1721 len = vma->vm_end - addr;
1722
1723 /* only read mappings where it is permitted */
1724 if (vma->vm_flags & VM_MAYREAD) {
> 1725 ret = strscpy(buf, addr, len); 1726 if (ret < 0)
1727 ret = len - 1;
1728 } else {
1729 ret = -EFAULT;
1730 }
1731 } else {
1732 ret = -EFAULT;
1733 }
1734
1735 mmap_read_unlock(mm);
1736 return ret;
1737 }
1738
Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki