diff options
author | Greg Kroah-Hartman <[email protected]> | 2023-12-18 11:27:47 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <[email protected]> | 2023-12-18 11:27:47 +0100 |
commit | 093976dd953c6d170b4562e4229be7c9314950e9 (patch) | |
tree | c3bc051248d1e42cd6a5fcbd6c5f34b2e8c973e0 | |
parent | 08b3485540d9e94ed8335f82e5fc491fc02f8423 (diff) | |
parent | 5496fb8eedd637e1e9d87655f86dc816afd5ad68 (diff) |
Merge tag 'fpga-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga into char-misc-next
Xu writes:
FPGA Manager changes for 6.8-rc1
DFL:
- Philipp's change uses memdup_array_user() to do better overflow check
All patches have been reviewed on the mailing list, and have been in the
last linux-next releases (as part of our for-next branch).
Signed-off-by: Xu Yilun <[email protected]>
* tag 'fpga-for-6.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga:
drivers/fpga: use standard array-copy function
-rw-r--r-- | drivers/fpga/dfl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl.c index dd7a783d53b5..e69b9f1f2a50 100644 --- a/drivers/fpga/dfl.c +++ b/drivers/fpga/dfl.c @@ -2008,8 +2008,8 @@ long dfl_feature_ioctl_set_irq(struct platform_device *pdev, (hdr.start + hdr.count < hdr.start)) return -EINVAL; - fds = memdup_user((void __user *)(arg + sizeof(hdr)), - array_size(hdr.count, sizeof(s32))); + fds = memdup_array_user((void __user *)(arg + sizeof(hdr)), + hdr.count, sizeof(s32)); if (IS_ERR(fds)) return PTR_ERR(fds); |