Skip to content

Commit

Permalink
sit: fix off-by-one in ipip6_tunnel_get_prl
Browse files Browse the repository at this point in the history
[ Upstream commit 298bf12 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Sascha Hlusiak authored and Greg Kroah-Hartman committed Oct 12, 2009
1 parent e928731 commit 2d85289
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion net/ipv6/sit.c
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,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;
Expand Down

0 comments on commit 2d85289

Please sign in to comment.