| Message ID | 1387753276-27009-1-git-send-email-alex.aring@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Dec 23, 2013 at 12:01:16AM +0100, Alexander Aring wrote: > This patch corrects the check on a linklocal address. > > 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. > > Signed-off-by: Alexander Aring <alex.aring@gmail.com> Acked-by: Hannes Frederic Sowa <hannes@stressinduktion.org> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Mon, Dec 23, 2013 at 12:01:16AM +0100, Alexander Aring wrote: > This patch corrects the check on a linklocal address. > > 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. > > Signed-off-by: Alexander Aring <alex.aring@gmail.com> > --- > - change check on linklocal address from > (ipv6_addr_src_scope(&a6->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL) to > (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL) which is a > little bit faster. > - change commit msg. <formletter> This is not the correct way to submit patches for inclusion in the stable kernel tree. Please read Documentation/stable_kernel_rules.txt for how to do this properly. </formletter> -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" 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/fs/nfs/nfs4filelayoutdev.c b/fs/nfs/nfs4filelayoutdev.c index c7c295e5..dc5e9e1 100644 --- a/fs/nfs/nfs4filelayoutdev.c +++ b/fs/nfs/nfs4filelayoutdev.c @@ -95,8 +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) == - IPV6_ADDR_SCOPE_LINKLOCAL && + if (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL && a6->sin6_scope_id != b6->sin6_scope_id) return false;
This patch corrects the check on a linklocal address. 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. Signed-off-by: Alexander Aring <alex.aring@gmail.com> --- - change check on linklocal address from (ipv6_addr_src_scope(&a6->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL) to (ipv6_addr_scope(&a6->sin6_addr) & IPV6_ADDR_LINKLOCAL) which is a little bit faster. - change commit msg. fs/nfs/nfs4filelayoutdev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)