]> www.infradead.org Git - users/jedix/linux-maple.git/commit
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:17:07 +0000 (12:17 -0700)
commit4ed6e83c78dc13ad61bdb6e66694cfa232c1bdc6
tree891db25dabe50c5e726660649e7670aa21fb16bc
parentad24fbcb6dd954b3129a4d62208489048eebb6f3
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