net/ipv4: Ensure that location of timestamp option is stored
authorDavid Ward <david.ward@ll.mit.edu>
Mon, 11 Mar 2013 10:43:39 +0000 (10:43 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Mar 2013 19:11:52 +0000 (12:11 -0700)
commit7436bcf6158d70346928b9b26568f5bb3213a36f
treea092676a959c4df2bcdd230d0421e3a03f28ffec
parent1c93c2e727a02efe7e143c6d6798facbab31d9e1
net/ipv4: Ensure that location of timestamp option is stored

[ Upstream commit 4660c7f498c07c43173142ea95145e9dac5a6d14 ]

This is needed in order to detect if the timestamp option appears
more than once in a packet, to remove the option if the packet is
fragmented, etc. My previous change neglected to store the option
location when the router addresses were prespecified and Pointer >
Length. But now the option location is also stored when Flag is an
unrecognized value, to ensure these option handling behaviors are
still performed.

Signed-off-by: David Ward <david.ward@ll.mit.edu>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
net/ipv4/ip_options.c