Skip to contentSkip to conversation

net: bridge: Use array_size() helper in copy_to_user()

PATCH Applied Gustavo A. R. Silva 2 participants 2 messages Sep 28, 2021 – Sep 29, 2021

Subsystems (3)
Networking Network drivers Ethernet bridge
lore
Share & tools
lore

Gustavo A. R. Silva

author
#0 lore raw

PATCH 1/1 net: bridge: Use array_size() helper in copy_to_user()

Use array_size() helper instead of the open-coded version in copy_to_user(). These sorts of multiplication factors need to be wrapped in array_size().

Link https://github.com/KSPP/linux/issues/160
Signed-off-by Gustavo A. R. Silva <[email protected]>
---
 net/bridge/br_ioctl.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
net/bridge/br_ioctl.c +5 -3
index 793b0db9d9a3..49c268871fc1 100644
@@ -71,7 +71,8 @@ static int get_fdb_entries(struct net_bridge *br, void __user *userbuf,
 
 	num = br_fdb_fillbuf(br, buf, maxnum, offset);
 	if (num > 0) {
-		if (copy_to_user(userbuf, buf, num*sizeof(struct __fdb_entry)))
+		if (copy_to_user(userbuf, buf,
+				 array_size(num, sizeof(struct __fdb_entry))))
 			num = -EFAULT;
 	}
 	kfree(buf);

@@ -188,7 +189,7 @@ int br_dev_siocdevprivate(struct net_device *dev, struct ifreq *rq, void __user
 			return -ENOMEM;
 
 		get_port_ifindices(br, indices, num);
-		if (copy_to_user(argp, indices, num * sizeof(int)))
+		if (copy_to_user(argp, indices, array_size(num, sizeof(int))))
 			num =  -EFAULT;
 		kfree(indices);
 		return num;

@@ -336,7 +337,8 @@ static int old_deviceless(struct net *net, void __user *uarg)
 
 		args[2] = get_bridge_ifindices(net, indices, args[2]);
 
-		ret = copy_to_user(uarg, indices, args[2]*sizeof(int))
+		ret = copy_to_user(uarg, indices,
+				   array_size(args[2], sizeof(int)))
 			? -EFAULT : args[2];
 
 		kfree(indices);
Signature · 1 line
2.27.0
CI Applied
#1 lore raw
This patch was applied to netdev/net-next.git (refs/heads/master):

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

Quoted 8 lines · On Tue, 28 Sep 2021 15:12:39 -0500 you wrote:

Use array_size() helper instead of the open-coded version in copy_to_user(). These sorts of multiplication factors need to be wrapped in array_size().

Link https://github.com/KSPP/linux/issues/160
Signed-off-by Gustavo A. R. Silva <[email protected]>

[...]

Here is the summary with links:
- [net-next] net: bridge: Use array_size() helper in copy_to_user()

    https://git.kernel.org/netdev/net-next/c/865bfb2affa8

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html