]> nv-tegra.nvidia Code Review - linux-2.6.git/commitdiff
sit: fix off-by-one in ipip6_tunnel_get_prl
authorSascha Hlusiak <contact@saschahlusiak.de>
Tue, 29 Sep 2009 11:27:05 +0000 (11:27 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 30 Sep 2009 23:39:27 +0000 (16:39 -0700)
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@saschahlusiak.de>
Acked-By: Fred L. Templin <Fred.L.Templin@boeing.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/sit.c

index d65e0c496cc0cd85d93652edd8f2a083029c2f73..dbd19a78ca73ad32b048b8e9c8b89f3600195c90 100644 (file)
@@ -274,7 +274,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
 
        c = 0;
        for (prl = t->prl; prl; prl = prl->next) {
 
        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;
                        break;
                if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr)
                        continue;