Message ID | 1351797004.2883.12.camel@bwh-desktop.uk.solarflarecom.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Ben Hutchings <bhutchings@solarflare.com> Date: Thu, 1 Nov 2012 19:10:04 +0000 > Parse the string into an array of bytes rather than ints, so we can > use is_link_local() rather than reimplementing it. > > Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/net/bridge/br_sysfs_br.c b/net/bridge/br_sysfs_br.c index e157b0d..82385fd 100644 --- a/net/bridge/br_sysfs_br.c +++ b/net/bridge/br_sysfs_br.c @@ -298,23 +298,18 @@ static ssize_t store_group_addr(struct device *d, const char *buf, size_t len) { struct net_bridge *br = to_bridge(d); - unsigned int new_addr[6]; + u8 new_addr[6]; int i; if (!capable(CAP_NET_ADMIN)) return -EPERM; - if (sscanf(buf, "%x:%x:%x:%x:%x:%x", + if (sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &new_addr[0], &new_addr[1], &new_addr[2], &new_addr[3], &new_addr[4], &new_addr[5]) != 6) return -EINVAL; - /* Must be 01:80:c2:00:00:0X */ - for (i = 0; i < 5; i++) - if (new_addr[i] != br_reserved_address[i]) - return -EINVAL; - - if (new_addr[5] & ~0xf) + if (!is_link_local(new_addr)) return -EINVAL; if (new_addr[5] == 1 || /* 802.3x Pause address */
Parse the string into an array of bytes rather than ints, so we can use is_link_local() rather than reimplementing it. Signed-off-by: Ben Hutchings <bhutchings@solarflare.com> --- net/bridge/br_sysfs_br.c | 11 +++-------- 1 files changed, 3 insertions(+), 8 deletions(-)