From a070b62aaabe353a52a693aca7f7e58810ee3d12 Mon Sep 17 00:00:00 2001 From: Dan Carpenter Date: Wed, 26 May 2010 00:38:56 -0700 Subject: [PATCH] --- yaml --- r: 199193 b: refs/heads/master c: ed0f160ad674407adb3aba499444f71c83289c63 h: refs/heads/master i: 199191: 40350a38aa5cda6e0acc5dd89c6ddc5582ddddad v: v3 --- [refs] | 2 +- trunk/net/ipv4/ipmr.c | 2 +- trunk/net/ipv6/ip6mr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index f7390aefa146..6d39da024a27 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d938a702e5ce8909ea68be97566150507bfea4df +refs/heads/master: ed0f160ad674407adb3aba499444f71c83289c63 diff --git a/trunk/net/ipv4/ipmr.c b/trunk/net/ipv4/ipmr.c index 45889103b3e2..856123fe32f9 100644 --- a/trunk/net/ipv4/ipmr.c +++ b/trunk/net/ipv4/ipmr.c @@ -1911,7 +1911,7 @@ static int __ipmr_fill_mroute(struct mr_table *mrt, struct sk_buff *skb, struct rtattr *mp_head; /* If cache is unresolved, don't try to parse IIF and OIF */ - if (c->mfc_parent > MAXVIFS) + if (c->mfc_parent >= MAXVIFS) return -ENOENT; if (VIF_EXISTS(mrt, c->mfc_parent)) diff --git a/trunk/net/ipv6/ip6mr.c b/trunk/net/ipv6/ip6mr.c index bd9e7d3e9c8e..073071f2b75b 100644 --- a/trunk/net/ipv6/ip6mr.c +++ b/trunk/net/ipv6/ip6mr.c @@ -2017,7 +2017,7 @@ static int __ip6mr_fill_mroute(struct mr6_table *mrt, struct sk_buff *skb, struct rtattr *mp_head; /* If cache is unresolved, don't try to parse IIF and OIF */ - if (c->mf6c_parent > MAXMIFS) + if (c->mf6c_parent >= MAXMIFS) return -ENOENT; if (MIF_EXISTS(mrt, c->mf6c_parent))