ipv6: fix calculation of option len in ip6_append_data
authorHannes Frederic Sowa <hannes@stressinduktion.org>
Sun, 11 May 2014 21:01:13 +0000 (23:01 +0200)
committerDavid S. Miller <davem@davemloft.net>
Wed, 14 May 2014 04:40:27 +0000 (00:40 -0400)
commit3a1cebe7e05027a1c96f2fc1a8eddf5f19b78f42
treeccff480edb57fb43e131c33549418553dba5e80e
parent3d4405226d27b3a215e4d03cfa51f536244e5de7
ipv6: fix calculation of option len in ip6_append_data

tot_len does specify the size of struct ipv6_txoptions. We need opt_flen +
opt_nflen to calculate the overall length of additional ipv6 extensions.

I found this while auditing the ipv6 output path for a memory corruption
reported by Alexey Preobrazhensky while he fuzzed an instrumented
AddressSanitizer kernel with trinity. This may or may not be the cause
of the original bug.

Fixes: 4df98e76cde7c6 ("ipv6: pmtudisc setting not respected with UFO/CORK")
Reported-by: Alexey Preobrazhensky <preobr@google.com>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/ipv6/ip6_output.c