aboutsummaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorGravatar Linus Torvalds <torvalds@linux-foundation.org> 2024-06-17 12:00:22 -0700
committerGravatar Linus Torvalds <torvalds@linux-foundation.org> 2024-06-17 12:00:22 -0700
commit5cf81d7b0d926fd1080529bda3f6151ff91c9178 (patch)
treede3f8b6607ad9fdffbff89bc89c6a7e049d5a6b2 /mm
parentMerge tag 'hyperv-fixes-signed-20240616' of git://git.kernel.org/pub/scm/linu... (diff)
parentMAINTAINERS: Update entries for Kees Cook (diff)
downloadlinux-5cf81d7b0d926fd1080529bda3f6151ff91c9178.tar.gz
linux-5cf81d7b0d926fd1080529bda3f6151ff91c9178.tar.bz2
linux-5cf81d7b0d926fd1080529bda3f6151ff91c9178.zip
Merge tag 'hardening-v6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux
Pull hardening fixes from Kees Cook: - yama: document function parameter (Christian Göttsche) - mm/util: Swap kmemdup_array() arguments (Jean-Philippe Brucker) - kunit/overflow: Adjust for __counted_by with DEFINE_RAW_FLEX() - MAINTAINERS: Update entries for Kees Cook * tag 'hardening-v6.10-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux: MAINTAINERS: Update entries for Kees Cook kunit/overflow: Adjust for __counted_by with DEFINE_RAW_FLEX() yama: document function parameter mm/util: Swap kmemdup_array() arguments
Diffstat (limited to 'mm')
-rw-r--r--mm/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/mm/util.c b/mm/util.c
index 6c3e6710e4de..fe723241b66f 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -139,14 +139,14 @@ EXPORT_SYMBOL(kmemdup_noprof);
* kmemdup_array - duplicate a given array.
*
* @src: array to duplicate.
- * @element_size: size of each element of array.
* @count: number of elements to duplicate from array.
+ * @element_size: size of each element of array.
* @gfp: GFP mask to use.
*
* Return: duplicated array of @src or %NULL in case of error,
* result is physically contiguous. Use kfree() to free.
*/
-void *kmemdup_array(const void *src, size_t element_size, size_t count, gfp_t gfp)
+void *kmemdup_array(const void *src, size_t count, size_t element_size, gfp_t gfp)
{
return kmemdup(src, size_mul(element_size, count), gfp);
}