lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[IPV4]: Fix setting broadcast for SIOCSIFNETMASK

Browse Source 
Fix setting of the broadcast address when the netmask is set via
SIOCSIFNETMASK in Linux 2.6.  The code wanted the old value of
ifa->ifa_mask but used it after it had already been overwritten with
the new value.

Signed-off-by: David Engel <gigem@comcast.net>
Signed-off-by: Arnaldo Carvalho de Melo <acme@mandriva.com>
This commit is contained in:
David Engel
2005-10-21 22:09:16 -05:00
committed by Arnaldo Carvalho de Melo
parent 95df1c04ab
commit dcab5e1eec
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
net/ipv4/devinet.c
View File

@@ -715,6 +715,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
break; break;
ret = 0; ret = 0;
if (ifa->ifa_mask != sin->sin_addr.s_addr) { if (ifa->ifa_mask != sin->sin_addr.s_addr) {
u32 old_mask = ifa->ifa_mask;
inet_del_ifa(in_dev, ifap, 0); inet_del_ifa(in_dev, ifap, 0);
ifa->ifa_mask = sin->sin_addr.s_addr; ifa->ifa_mask = sin->sin_addr.s_addr;
ifa->ifa_prefixlen = inet_mask_len(ifa->ifa_mask); ifa->ifa_prefixlen = inet_mask_len(ifa->ifa_mask);
@@ -728,7 +729,7 @@ int devinet_ioctl(unsigned int cmd, void __user *arg)
if ((dev->flags & IFF_BROADCAST) && if ((dev->flags & IFF_BROADCAST) &&
(ifa->ifa_prefixlen < 31) && (ifa->ifa_prefixlen < 31) &&
(ifa->ifa_broadcast == (ifa->ifa_broadcast ==
(ifa->ifa_local|~ifa->ifa_mask))) { (ifa->ifa_local|~old_mask))) {
ifa->ifa_broadcast = (ifa->ifa_local | ifa->ifa_broadcast = (ifa->ifa_local |
~sin->sin_addr.s_addr); ~sin->sin_addr.s_addr);
} }