Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=39a6d06300128d32f361f4f790beba0ca83730eb
Commit:     39a6d06300128d32f361f4f790beba0ca83730eb
Parent:     9bd85e32644d4d3744117b0a196ad4382f8acf35
Author:     Denis V. Lunev <[EMAIL PROTECTED]>
AuthorDate: Mon Jan 14 23:06:19 2008 -0800
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:02:13 2008 -0800

    [NETNS]: Process inet_confirm_addr in the correct namespace.
    
    inet_confirm_addr can be called with NULL in_dev from arp_ignore iff
    scope is RT_SCOPE_LINK.
    
    Lets always pass the device and check for RT_SCOPE_LINK scope inside
    inet_confirm_addr. This let us take network namespace from in_device a
    need for an additional argument.
    
    Signed-off-by: Denis V. Lunev <[EMAIL PROTECTED]>
    Signed-off-by: David S. Miller <[EMAIL PROTECTED]>
---
 net/ipv4/arp.c     |    1 -
 net/ipv4/devinet.c |    6 ++++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 6f0827b..b2c19cb 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -402,7 +402,6 @@ static int arp_ignore(struct in_device *in_dev, __be32 sip, 
__be32 tip)
        case 3: /* Do not reply for scope host addresses */
                sip = 0;
                scope = RT_SCOPE_LINK;
-               in_dev = NULL;
                break;
        case 4: /* Reserved */
        case 5:
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c
index dc1665a..e381edb 100644
--- a/net/ipv4/devinet.c
+++ b/net/ipv4/devinet.c
@@ -978,13 +978,15 @@ __be32 inet_confirm_addr(struct in_device *in_dev,
 {
        __be32 addr = 0;
        struct net_device *dev;
+       struct net *net;
 
-       if (in_dev != NULL)
+       if (scope != RT_SCOPE_LINK)
                return confirm_addr_indev(in_dev, dst, local, scope);
 
+       net = in_dev->dev->nd_net;
        read_lock(&dev_base_lock);
        rcu_read_lock();
-       for_each_netdev(&init_net, dev) {
+       for_each_netdev(net, dev) {
                if ((in_dev = __in_dev_get_rcu(dev))) {
                        addr = confirm_addr_indev(in_dev, dst, local, scope);
                        if (addr)
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to