GIT: unionfs2-2.6.27.y: sit: fix off-by-one in ipip6_tunnel_get_prl

Erez Zadok ezk at fsl.cs.sunysb.edu
Thu Aug 12 23:15:07 EDT 2010


commit f02363178930a9fb73c88f88c3c347d27d62a082
Author: Sascha Hlusiak <contact at saschahlusiak.de>
Date:   Tue Sep 29 11:27:05 2009 +0000

    sit: fix off-by-one in ipip6_tunnel_get_prl
    
    commit 298bf12ddb25841804f26234a43b89da1b1c0e21 upstream.
    
    When requesting all prl entries (kprl.addr == INADDR_ANY) and there are
    more prl entries than there is space passed from userspace, the existing
    code would always copy cmax+1 entries, which is more than can be handled.
    
    This patch makes the kernel copy only exactly cmax entries.
    
    Signed-off-by: Sascha Hlusiak <contact at saschahlusiak.de>
    Acked-By: Fred L. Templin <Fred.L.Templin at boeing.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>

diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c
index b7a50e9..0a913c9 100644
--- a/net/ipv6/sit.c
+++ b/net/ipv6/sit.c
@@ -260,7 +260,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
 
 	c = 0;
 	for (prl = t->prl; prl; prl = prl->next) {
-		if (c > cmax)
+		if (c >= cmax)
 			break;
 		if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr)
 			continue;


More information about the unionfs-cvs mailing list