fs/nilfs2: use standard array-copy-function
Ryusuke Konishi
maintainerPATCH 1/1 fs/nilfs2: use standard array-copy-function
From: Philipp Stanner <[email protected]>
ioctl.c utilizes memdup_user() to copy a userspace array. An overflow check is performed manually before the function's invocation.
The new function memdup_array_user() standardizes copying userspace arrays, thus, improving readability by making it more clear that an array is being copied. Additionally, it also performs an overflow check.
Remove the (now redundant) manual overflow-check and replace memdup_user() with memdup_array_user().
In addition, improve the grammar of the comment above memdup_array_user().
---
Andrew, please queue this cleanup patch for the next merge window.
It's a little early as the current merge window isn't over yet, but I haven't had any problems with it and I feel it's better to focus on other series, so I'll send this now.
Thanks,
Ryusuke Konishi
fs/nilfs2/ioctl.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
fs/nilfs2/ioctl.c +4 -6
@@ -872,16 +872,14 @@ static int nilfs_ioctl_clean_segments(struct inode *inode, struct file *filp, nsegs = argv[4 ].v_nmembs;if (argv[4 ].v_size != argsz[4 ]) goto out; -if (nsegs >UINT_MAX /sizeof (__u64)) - goto out;/* * argv[4] points to segment numbers this ioctl cleans. We -* use kmalloc() for its buffer because memory used for the -* segment numbers is enough small. +* use kmalloc() for its buffer because the memory used for the +* segment numbers is small enough. */ - kbufs[4 ] =memdup_user ((void __user *)(unsigned long )argv[4 ].v_base, - nsegs *sizeof (__u64)); + kbufs[4 ] =memdup_array_user ((void __user *)(unsigned long )argv[4 ].v_base, + nsegs,sizeof (__u64));if (IS_ERR (kbufs[4 ])) { ret =PTR_ERR (kbufs[4 ]); goto out;
Signature · 1 line
2.34.1