diff options
author | Sascha Hlusiak <contact@saschahlusiak.de> | 2009-09-29 07:27:05 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-09-30 19:39:27 -0400 |
commit | 298bf12ddb25841804f26234a43b89da1b1c0e21 (patch) | |
tree | 9a381edac05354fcc7750feb6b30335cd2938726 /net | |
parent | d99927f4d93f36553699573b279e0ff98ad7dea6 (diff) |
sit: fix off-by-one in ipip6_tunnel_get_prl
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>
Diffstat (limited to 'net')
-rw-r--r-- | net/ipv6/sit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index d65e0c496cc0..dbd19a78ca73 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c | |||
@@ -274,7 +274,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, | |||
274 | 274 | ||
275 | c = 0; | 275 | c = 0; |
276 | for (prl = t->prl; prl; prl = prl->next) { | 276 | for (prl = t->prl; prl; prl = prl->next) { |
277 | if (c > cmax) | 277 | if (c >= cmax) |
278 | break; | 278 | break; |
279 | if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr) | 279 | if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr) |
280 | continue; | 280 | continue; |