Skip to contentSkip to conversation

nfs: fix dead code of ipv6_addr_scope

PATCH In review Alexander Aring 3 participants 7 messages Dec 21, 2013 – Dec 22, 2013 3 messages not in the archive

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nfs: fix dead code of ipv6_addr_scope

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false.

---
I think ipv6_addr_src_scope should be correct, can somebody from netdev ml confirm this please?
I stumple over that and I did not compile and test it. Maybe this is something for stable?

 fs/nfs/nfs4filelayoutdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4filelayoutdev.c +1 -1
index c7c295e5..efac602 100644
@@ -95,7 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
 		b6 = (struct sockaddr_in6 *)addr2;
 
 		/* LINKLOCAL addresses must have matching scope_id */
-		if (ipv6_addr_scope(&a6->sin6_addr) ==
+		if (ipv6_addr_src_scope(&a6->sin6_addr) ==
 		    IPV6_ADDR_SCOPE_LINKLOCAL &&
 		    a6->sin6_scope_id != b6->sin6_scope_id)
 			return false;
Signature · 6 lines
1.8.5.2

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
#1 lore raw

Hi,

I saw right now file "./net/sctp/ipv6.c" in function sctp_v6_scope has the same issue.

- Alex

A message that is not in the archive (sent off-list or not yet received): 1387600744-11366-1-git-send-email-alex.aring-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org

#3 lore raw
Quoted 22 lines · Alexander Aring

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false.

---
I think ipv6_addr_src_scope should be correct, can somebody from netdev ml confirm this please?
I stumple over that and I did not compile and test it. Maybe this is something for stable?

 fs/nfs/nfs4filelayoutdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4filelayoutdev.c +0 -0
index c7c295e5..efac602 100644

fs/nfs/nfs4filelayoutdev.c same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) · line 101

Quoted 8 lines
fs/nfs/nfs4filelayoutdev.c +1 -1
@@ -95,7 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
 		b6 = (struct sockaddr_in6 *)addr2;
 
 		/* LINKLOCAL addresses must have matching scope_id */
-		if (ipv6_addr_scope(&a6->sin6_addr) ==
+		if (ipv6_addr_src_scope(&a6->sin6_addr) ==
 		    IPV6_ADDR_SCOPE_LINKLOCAL &&
 		    a6->sin6_scope_id != b6->sin6_scope_id)
 			return false;

Good catch!

SCOPE_TYPE also can be compared and is no bitfield, so the patch is good. Do you mind also proposing a patch for sctp?

Thanks,

Hannes

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20131221124440.GG14073-5j1vdhnGyZutBveJljeh2VPnkB77EeZ12LY78lusg7I@public.gmane.org

#5 lore raw

Hi Hannes,

Quoted 25 lines · Hannes Frederic Sowa
Quoted 24 lines · Alexander Aring

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false.

---
I think ipv6_addr_src_scope should be correct, can somebody from netdev ml confirm this please?
I stumple over that and I did not compile and test it. Maybe this is something for stable?

 fs/nfs/nfs4filelayoutdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4filelayoutdev.c +0 -0
index c7c295e5..efac602 100644
@@ -95,7 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
 		b6 = (struct sockaddr_in6 *)addr2;
 
Quoted 9 lines

fs/nfs/nfs4filelayoutdev.c same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) · line 101

Quoted 6 lines
fs/nfs/nfs4filelayoutdev.c +1 -1
 		/* LINKLOCAL addresses must have matching scope_id */
-		if (ipv6_addr_scope(&a6->sin6_addr) ==
+		if (ipv6_addr_src_scope(&a6->sin6_addr) ==
 		    IPV6_ADDR_SCOPE_LINKLOCAL &&
 		    a6->sin6_scope_id != b6->sin6_scope_id)
 			return false;

Good catch!

thanks.

I am still unsure if sctp is correct or not, I think it isn't correct. Because we compare and don't check if any bit is set.

We don't use IPV6_ADDR_SCOPE_TYPE here. We use IPV6_ADDR_TYPE. But we can't compare it.

Current implementation is:

	v6scope = ipv6_addr_scope(&addr->v6.sin6_addr);
        switch (v6scope) {      
        case IFA_HOST:          
                retval = SCTP_SCOPE_LOOPBACK;
                break;
        case IFA_LINK:
                retval = SCTP_SCOPE_LINK;
                break;
        case IFA_SITE:
                retval = SCTP_SCOPE_PRIVATE;
                break;
        default:
                retval = SCTP_SCOPE_GLOBAL;
                break;
        }

and should be something like:

        v6scope = ipv6_addr_src_scope(&addr->v6.sin6_addr);
        switch (v6scope) {      
        case IPV6_ADDR_SCOPE_NODELOCAL:          
                retval = SCTP_SCOPE_LOOPBACK;
                break;
        case IPV6_ADDR_SCOPE_LINKLOCAL:
                retval = SCTP_SCOPE_LINK;
                break;
        case IPV6_ADDR_SCOPE_SITELOCAL:
                retval = SCTP_SCOPE_PRIVATE;
                break;
	case IPV6_ADDR_SCOPE_GLOBAL:
                retval = SCTP_SCOPE_GLOBAL;
		break;
        default:
                retval = SCTP_SCOPE_UNUSABLE;
                break;
        }

Looks this okay for you? Then we can handle SCTP_SCOPE_UNUSABLE, too.

- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#6 lore raw
Quoted 37 lines · Alexander Aring

Hi Hannes,

Quoted 25 lines · Hannes Frederic Sowa
Quoted 24 lines · Alexander Aring

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false.

---
I think ipv6_addr_src_scope should be correct, can somebody from netdev ml confirm this please?
I stumple over that and I did not compile and test it. Maybe this is something for stable?

 fs/nfs/nfs4filelayoutdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4filelayoutdev.c +0 -0
index c7c295e5..efac602 100644
@@ -95,7 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
 		b6 = (struct sockaddr_in6 *)addr2;
 
Quoted 9 lines

fs/nfs/nfs4filelayoutdev.c same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) · line 101

Quoted 6 lines
fs/nfs/nfs4filelayoutdev.c +1 -1
 		/* LINKLOCAL addresses must have matching scope_id */
-		if (ipv6_addr_scope(&a6->sin6_addr) ==
+		if (ipv6_addr_src_scope(&a6->sin6_addr) ==
 		    IPV6_ADDR_SCOPE_LINKLOCAL &&
 		    a6->sin6_scope_id != b6->sin6_scope_id)
 			return false;

Good catch!

Quoted 7 lines

thanks.

I am still unsure if sctp is correct or not, I think it isn't correct. Because we compare and don't check if any bit is set.

We don't use IPV6_ADDR_SCOPE_TYPE here. We use IPV6_ADDR_TYPE. But we can't compare it.

Actually, this is fine, too. ipv6_addr_scope does mask the addr_type with IPV6_ADDR_SCOPE_MASK (which is 0x00f0U). If you look at addrconf_core.c you see that the 4 bits stand by itself each time.

Actually it seems ipv6_addr_src_scope is better suitable for multicast scope handling and ipv6_addr_scope with IFA_{HOST,LINK,SITE} is fine for non-multicast. In this case there is no difference.

Maybe an int ipv6_cmp_sockaddr(struct in6_addr *a1, int scope1,
struct in6_addr *a2, int scope2)
or
int ipv6_cmp_sockaddr(struct sockaddr_in6 *s1,
struct sockaddr_in6 *s2)

would be nice so we don't need to open code it everywhere.

Greetings,

Hannes

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

A message that is not in the archive (sent off-list or not yet received): 20131222023054.GH14073-5j1vdhnGyZutBveJljeh2VPnkB77EeZ12LY78lusg7I@public.gmane.org

#8 lore raw

Hi Hannes,

Quoted 46 lines · Hannes Frederic Sowa
Quoted 37 lines · Alexander Aring

Hi Hannes,

Quoted 25 lines · Hannes Frederic Sowa
Quoted 24 lines · Alexander Aring

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false.

---
I think ipv6_addr_src_scope should be correct, can somebody from netdev ml confirm this please?
I stumple over that and I did not compile and test it. Maybe this is something for stable?

 fs/nfs/nfs4filelayoutdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4filelayoutdev.c +0 -0
index c7c295e5..efac602 100644
@@ -95,7 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
 		b6 = (struct sockaddr_in6 *)addr2;
 
Quoted 9 lines

fs/nfs/nfs4filelayoutdev.c same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) · line 101

Quoted 6 lines
fs/nfs/nfs4filelayoutdev.c +1 -1
 		/* LINKLOCAL addresses must have matching scope_id */
-		if (ipv6_addr_scope(&a6->sin6_addr) ==
+		if (ipv6_addr_src_scope(&a6->sin6_addr) ==
 		    IPV6_ADDR_SCOPE_LINKLOCAL &&
 		    a6->sin6_scope_id != b6->sin6_scope_id)
 			return false;

Good catch!

Quoted 7 lines

thanks.

I am still unsure if sctp is correct or not, I think it isn't correct. Because we compare and don't check if any bit is set.

We don't use IPV6_ADDR_SCOPE_TYPE here. We use IPV6_ADDR_TYPE. But we can't compare it.

Quoted 8 lines

Actually, this is fine, too. ipv6_addr_scope does mask the addr_type with IPV6_ADDR_SCOPE_MASK (which is 0x00f0U). If you look at addrconf_core.c you see that the 4 bits stand by itself each time.

Actually it seems ipv6_addr_src_scope is better suitable for multicast scope handling and ipv6_addr_scope with IFA_{HOST,LINK,SITE} is fine for non-multicast. In this case there is no difference.

ah thanks, now I understand it!

so an alternative would be:

if (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL &&

	a6->sin6_scope_id != b6->sin6_scope_id)
	...

maybe this is a little bit faster instead of ipv6_addr_src_scope. Should I resend a v2 with the faster solution?

Quoted 6 lines

Maybe an int ipv6_cmp_sockaddr(struct in6_addr *a1, int scope1,
struct in6_addr *a2, int scope2)
or
int ipv6_cmp_sockaddr(struct sockaddr_in6 *s1,
struct sockaddr_in6 *s2)

I don't understand why we need such a function here. We only check if "a6" is linklocal and has a different sin6_scope_id than "b6" sin6_scope_id and we don't compare "a6" and "b6" here (then "b6" should be a linklocal, too). I think it's too abstract for me what exactly "compare" means in this case. :-)

- Alex
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

#9 lore raw
Quoted 57 lines · Alexander Aring
Quoted 46 lines · Hannes Frederic Sowa
Quoted 37 lines · Alexander Aring

Hi Hannes,

Quoted 25 lines · Hannes Frederic Sowa
Quoted 24 lines · Alexander Aring

The correct way to check on IPV6_ADDR_SCOPE_LINKLOCAL is to check with the ipv6_addr_src_scope function.

Currently this can't be work, because ipv6_addr_scope returns a int with a mask of IPV6_ADDR_SCOPE_MASK (0x00f0U) and IPV6_ADDR_SCOPE_LINKLOCAL is 0x02. So the condition is always false.

---
I think ipv6_addr_src_scope should be correct, can somebody from netdev ml confirm this please?
I stumple over that and I did not compile and test it. Maybe this is something for stable?

 fs/nfs/nfs4filelayoutdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/nfs4filelayoutdev.c +0 -0
index c7c295e5..efac602 100644
@@ -95,7 +95,7 @@ same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2)
 		b6 = (struct sockaddr_in6 *)addr2;
 
Quoted 9 lines

fs/nfs/nfs4filelayoutdev.c same_sockaddr(struct sockaddr *addr1, struct sockaddr *addr2) · line 101

Quoted 6 lines
fs/nfs/nfs4filelayoutdev.c +1 -1
 		/* LINKLOCAL addresses must have matching scope_id */
-		if (ipv6_addr_scope(&a6->sin6_addr) ==
+		if (ipv6_addr_src_scope(&a6->sin6_addr) ==
 		    IPV6_ADDR_SCOPE_LINKLOCAL &&
 		    a6->sin6_scope_id != b6->sin6_scope_id)
 			return false;

Good catch!

Quoted 7 lines

thanks.

I am still unsure if sctp is correct or not, I think it isn't correct. Because we compare and don't check if any bit is set.

We don't use IPV6_ADDR_SCOPE_TYPE here. We use IPV6_ADDR_TYPE. But we can't compare it.

Quoted 8 lines

Actually, this is fine, too. ipv6_addr_scope does mask the addr_type with IPV6_ADDR_SCOPE_MASK (which is 0x00f0U). If you look at addrconf_core.c you see that the 4 bits stand by itself each time.

Actually it seems ipv6_addr_src_scope is better suitable for multicast scope handling and ipv6_addr_scope with IFA_{HOST,LINK,SITE} is fine for non-multicast. In this case there is no difference.

ah thanks, now I understand it!

Quoted 8 lines

so an alternative would be:

if (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL &&

	a6->sin6_scope_id != b6->sin6_scope_id)
	...

maybe this is a little bit faster instead of ipv6_addr_src_scope. Should I resend a v2 with the faster solution?

Yes, please do so. Thanks!

Quoted 7 lines
Quoted 6 lines

Maybe an int ipv6_cmp_sockaddr(struct in6_addr *a1, int scope1,
struct in6_addr *a2, int scope2)
or
int ipv6_cmp_sockaddr(struct sockaddr_in6 *s1,
struct sockaddr_in6 *s2)

Quoted 5 lines

I don't understand why we need such a function here. We only check if "a6" is linklocal and has a different sin6_scope_id than "b6" sin6_scope_id and we don't compare "a6" and "b6" here (then "b6" should be a linklocal, too). I think it's too abstract for me what exactly "compare" means in this case. :-)

That were exactly the semantics I had in mind. Something like ipv6_equal_sockaddr would be a better name, you are right.

Trying to sort ipv6 addresses depends on the specific code and I would leave that open-coded in the specific case.

Greetings,

Hannes

--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html