diff options
| author | Jiri Pirko <jiri@resnulli.us> | 2013-09-06 16:02:25 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-10-13 16:08:28 -0700 |
| commit | 711b8c96842e7e93b01caad6403488498d5cecfa (patch) | |
| tree | a0aec69b999bf930de5abd48bd88e13822a2b6f0 /net/ipv6 | |
| parent | a4ae4c6176a7c878018adf470a47c1fae9090978 (diff) | |
| download | linux-3.10-711b8c96842e7e93b01caad6403488498d5cecfa.tar.gz linux-3.10-711b8c96842e7e93b01caad6403488498d5cecfa.tar.bz2 linux-3.10-711b8c96842e7e93b01caad6403488498d5cecfa.zip | |
ipv6/exthdrs: accept tlv which includes only padding
[ Upstream commit 8112b1fe071be01a28a774ed55909e6f4b29712d ]
In rfc4942 and rfc2460 I cannot find anything which would implicate to
drop packets which have only padding in tlv.
Current behaviour breaks TAHI Test v6LC.1.2.6.
Problem was intruduced in:
9b905fe6843 "ipv6/exthdrs: strict Pad1 and PadN check"
Signed-off-by: Jiri Pirko <jiri@resnulli.us>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'net/ipv6')
| -rw-r--r-- | net/ipv6/exthdrs.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/net/ipv6/exthdrs.c b/net/ipv6/exthdrs.c index 07a7d65a7cb..8d67900aa00 100644 --- a/net/ipv6/exthdrs.c +++ b/net/ipv6/exthdrs.c @@ -162,12 +162,6 @@ static bool ip6_parse_tlv(const struct tlvtype_proc *procs, struct sk_buff *skb) off += optlen; len -= optlen; } - /* This case will not be caught by above check since its padding - * length is smaller than 7: - * 1 byte NH + 1 byte Length + 6 bytes Padding - */ - if ((padlen == 6) && ((off - skb_network_header_len(skb)) == 8)) - goto bad; if (len == 0) return true; |