aboutsummaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authorHans Schillstrom <hans@schillstrom.com>2014-02-27 12:57:58 +0100
committerDavid S. Miller <davem@davemloft.net>2014-02-27 18:27:26 -0500
commitaccfe0e356327da5bd53da8852b93fc22de9b5fc (patch)
treedf6d84edf83f7c9e5f64a3d055ef22d1bab9a9a3 /net
parentfeff9ab2e7fa773b6a3965f77375fe89f7fd85cf (diff)
downloadlinux-accfe0e356327da5bd53da8852b93fc22de9b5fc.tar.gz
ipv6: ipv6_find_hdr restore prev functionality
The commit 9195bb8e381d81d5a315f911904cdf0cfcc919b8 ("ipv6: improve ipv6_find_hdr() to skip empty routing headers") broke ipv6_find_hdr(). When a target is specified like IPPROTO_ICMPV6 ipv6_find_hdr() returns -ENOENT when it's found, not the header as expected. A part of IPVS is broken and possible also nft_exthdr_eval(). When target is -1 which it is most cases, it works. This patch exits the do while loop if the specific header is found so the nexthdr could be returned as expected. Reported-by: Art -kwaak- van Breemen <ard@telegraafnet.nl> Signed-off-by: Hans Schillstrom <hans@schillstrom.com> CC:Ansis Atteka <aatteka@nicira.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/ipv6/exthdrs_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv6/exthdrs_core.c b/net/ipv6/exthdrs_core.c
index 140748debc4..8af3eb57f43 100644
--- a/net/ipv6/exthdrs_core.c
+++ b/net/ipv6/exthdrs_core.c
@@ -212,7 +212,7 @@ int ipv6_find_hdr(const struct sk_buff *skb, unsigned int *offset,
found = (nexthdr == target);
if ((!ipv6_ext_hdr(nexthdr)) || nexthdr == NEXTHDR_NONE) {
- if (target < 0)
+ if (target < 0 || found)
break;
return -ENOENT;
}