diff options
| author | David S. Miller <davem@davemloft.net> | 2011-03-09 13:27:16 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-03-09 13:27:16 -0800 |
| commit | 6c91afe1a984d43f922a6a70c7c390b7fb8de45e (patch) | |
| tree | 0c04726d20503aaea4560d5c3fa9e10f41de1951 /net | |
| parent | e380688217feba40db450253d16e9fb2c59a625a (diff) | |
| download | linux-6c91afe1a984d43f922a6a70c7c390b7fb8de45e.tar.gz linux-6c91afe1a984d43f922a6a70c7c390b7fb8de45e.tar.bz2 linux-6c91afe1a984d43f922a6a70c7c390b7fb8de45e.zip | |
ipv4: Fix erroneous uses of ifa_address.
In usual cases ifa_address == ifa_local, but in the case where
SIOCSIFDSTADDR sets the destination address on a point-to-point
link, ifa_address gets set to that destination address.
Therefore we should use ifa_local when we want the local interface
address.
There were two cases where the selection was done incorrectly:
1) When devinet_ioctl() does matching, it checks ifa_address even
though gifconf correct reported ifa_local to the user
2) IN_DEV_ARP_NOTIFY handling sends a gratuitous ARP using
ifa_address instead of ifa_local.
Reported-by: Julian Anastasov <ja@ssi.bg>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/devinet.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index df4616fce929..036652c8166d 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -670,7 +670,7 @@ int devinet_ioctl(struct net *net, unsigned int cmd, void __user *arg) ifap = &ifa->ifa_next) { if (!strcmp(ifr.ifr_name, ifa->ifa_label) && sin_orig.sin_addr.s_addr == - ifa->ifa_address) { + ifa->ifa_local) { break; /* found */ } } @@ -1040,8 +1040,8 @@ static void inetdev_send_gratuitous_arp(struct net_device *dev, return; arp_send(ARPOP_REQUEST, ETH_P_ARP, - ifa->ifa_address, dev, - ifa->ifa_address, NULL, + ifa->ifa_local, dev, + ifa->ifa_local, NULL, dev->dev_addr, NULL); } |