bonding: add ip checks when store ip target

PATCH Superseded Ding Tianhong 2 participants 2 messages Nov 14, 2013

Subsystems (3)

Networking Network drivers Bonding driver

lore

Share & tools

lore

Ding Tianhong

author

2013-11-14 11:05 UTC #0 lore raw

PATCH v3 1/1 bonding: add ip checks when store ip target

I met a Bug when I add ip target with the wrong ip address:

echo +500.500.500.500 > /sys/class/net/bond0/bonding/arp_ip_target

the wrong ip address will transfor to 245.245.245.244 and add to the ip target success, it is uncorrect, so I add checks to avoid adding wrong address.

The in4_pton() will set wrong ip address to 0.0.0.0, it will return by the next check and will not add to ip target.

Thanks for Veaceslav's opinion and make the code more simplify, more correctly.

Signed-off-by Ding Tianhong <[email protected]>

---
 drivers/net/bonding/bond_sysfs.c | 19 ++++++-------------
 drivers/net/bonding/bonding.h    |  3 +++
 2 files changed, 9 insertions(+), 13 deletions(-)

drivers/net/bonding/bond_sysfs.c +6 ~~-13~~

index 47749c9..147dd9c 100644
@@ -611,15 +611,14 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 		return restart_syscall();
 
 	targets = bond->params.arp_targets;
-	newtarget = in_aton(buf + 1);
+	if (!in4_pton(buf + 1, -1, (u8 *)&newtarget, -1, NULL) ||
+			IS_IP_TARGET_UNUSABLE_ADDRESS(newtarget)) {
+		pr_err("%s: invalid ARP target %pI4 specified for addition\n",
+		       bond->dev->name, &newtarget);
+		goto out;
+	}
 	/* look for adds */
 	if (buf[0] == '+') {
-		if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-			pr_err("%s: invalid ARP target %pI4 specified for addition\n",
-			       bond->dev->name, &newtarget);
-			goto out;
-		}
-
 		if (bond_get_targets_ip(targets, newtarget) != -1) { /* dup */
 			pr_err("%s: ARP target %pI4 is already present\n",
 			       bond->dev->name, &newtarget);

@@ -642,12 +641,6 @@ static ssize_t bonding_store_arp_targets(struct device *d,
 		targets[ind] = newtarget;
 		write_unlock_bh(&bond->lock);
 	} else if (buf[0] == '-')	{
-		if ((newtarget == 0) || (newtarget == htonl(INADDR_BROADCAST))) {
-			pr_err("%s: invalid ARP target %pI4 specified for removal\n",
-			       bond->dev->name, &newtarget);
-			goto out;
-		}
-
 		ind = bond_get_targets_ip(targets, newtarget);
 		if (ind == -1) {
 			pr_err("%s: unable to remove nonexistent ARP target %pI4.\n",

drivers/net/bonding/bonding.h +3 -0

index 046a605..253d5da 100644
@@ -63,6 +63,9 @@
 		(((mode) == BOND_MODE_TLB) ||	\
 		 ((mode) == BOND_MODE_ALB))
 
+#define IS_IP_TARGET_UNUSABLE_ADDRESS(a)	\
+	((htonl(INADDR_BROADCAST) == a) ||	\
+	 ipv4_is_zeronet(a))
 /*
  * Less bad way to call ioctl from within the kernel; this needs to be
  * done some other way to get the call out of interrupt context.

Signature · 1 line

1.7.12

David Miller

maintainer

2013-11-14 21:55 UTC #1 lore raw

From: Ding Tianhong <[email protected]>
Date: Thu, 14 Nov 2013 19:02:42 +0800

drivers/net/bonding/bond_sysfs.c static ssize_t bonding_store_arp_targets(struct device *d, · line 615

Quoted 4 lines

drivers/net/bonding/bond_sysfs.c +2 -1

 	targets = bond->params.arp_targets;
-	newtarget = in_aton(buf + 1);
+	if (!in4_pton(buf + 1, -1, (u8 *)&newtarget, -1, NULL) ||
+			IS_IP_TARGET_UNUSABLE_ADDRESS(newtarget)) {

This is not indented correctly.

On the second line, the IS_IP_TARGET... should start at the very first column after the openning parenthesis on the previous line.

If you are using only TAB characters to indent, rather than an appropriate mix of TAB and SPACE characters, you are doing it wrong.

Thanks.