Commit 2d852892 authored by Sascha Hlusiak's avatar Sascha Hlusiak Committed by Greg Kroah-Hartman

sit: fix off-by-one in ipip6_tunnel_get_prl

[ Upstream commit 298bf12d ]

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: default avatarSascha Hlusiak <contact@saschahlusiak.de>
Acked-By: default avatarFred L. Templin <Fred.L.Templin@boeing.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent e928731a
...@@ -313,7 +313,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t, ...@@ -313,7 +313,7 @@ static int ipip6_tunnel_get_prl(struct ip_tunnel *t,
c = 0; c = 0;
for (prl = t->prl; prl; prl = prl->next) { for (prl = t->prl; prl; prl = prl->next) {
if (c > cmax) if (c >= cmax)
break; break;
if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr) if (kprl.addr != htonl(INADDR_ANY) && prl->addr != kprl.addr)
continue; continue;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment