diff options
| author | Christian Brauner <brauner@kernel.org> | 2026-05-21 15:34:12 +0200 |
|---|---|---|
| committer | Christian Brauner <brauner@kernel.org> | 2026-05-21 15:34:12 +0200 |
| commit | d687e16b5295b5fd9599b54a4943033bceb9c078 (patch) | |
| tree | 3e853c55727e6fce53a11a853a17ce98a74fda43 /lib | |
| parent | 73ccac859fd4bbc89ae4c05816e32db7adf234a6 (diff) | |
| parent | 7dc6acb3d56bc2c5d119c86abd8fe96034084fc8 (diff) | |
| download | linux-next-history-d687e16b5295b5fd9599b54a4943033bceb9c078.tar.gz | |
Merge branch 'vfs-7.2.misc' into vfs.all
Signed-off-by: Christian Brauner <brauner@kernel.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/iov_iter.c | 8 | ||||
| -rw-r--r-- | lib/vsprintf.c | 7 |
2 files changed, 4 insertions, 11 deletions
diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 243662af1af73..273919b161617 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1224,13 +1224,13 @@ const void *dup_iter(struct iov_iter *new, struct iov_iter *old, gfp_t flags) { *new = *old; if (iov_iter_is_bvec(new)) - return new->bvec = kmemdup(new->bvec, - new->nr_segs * sizeof(struct bio_vec), + return new->bvec = kmemdup_array(new->bvec, + new->nr_segs, sizeof(struct bio_vec), flags); else if (iov_iter_is_kvec(new) || iter_is_iovec(new)) /* iovec and kvec have identical layout */ - return new->__iov = kmemdup(new->__iov, - new->nr_segs * sizeof(struct iovec), + return new->__iov = kmemdup_array(new->__iov, + new->nr_segs, sizeof(struct iovec), flags); return NULL; } diff --git a/lib/vsprintf.c b/lib/vsprintf.c index 9f359b31c8d1c..a6169e9bcdc9e 100644 --- a/lib/vsprintf.c +++ b/lib/vsprintf.c @@ -129,13 +129,6 @@ unsigned long simple_strtoul(const char *cp, char **endp, unsigned int base) } EXPORT_SYMBOL(simple_strtoul); -unsigned long simple_strntoul(const char *cp, char **endp, unsigned int base, - size_t max_chars) -{ - return simple_strntoull(cp, endp, base, max_chars); -} -EXPORT_SYMBOL(simple_strntoul); - /** * simple_strtol - convert a string to a signed long * @cp: The start of the string |