UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net/ipv4: Ensure that location of timestamp option is stored 

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>
This commit is contained in:
David Ward 2013-03-11 10:43:39 +00:00 committed by David S. Miller
parent 47ce9c4821
commit 4660c7f498
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
net/ipv4/ip_options.c
View File

@ -370,7 +370,6 @@ int ip_options_compile(struct net *net,
} }
switch (optptr[3]&0xF) { switch (optptr[3]&0xF) {
case IPOPT_TS_TSONLY: case IPOPT_TS_TSONLY:
opt->ts = optptr - iph;
if (skb) if (skb)
timeptr = &optptr[optptr[2]-1]; timeptr = &optptr[optptr[2]-1];
opt->ts_needtime = 1; opt->ts_needtime = 1;
@ -381,7 +380,6 @@ int ip_options_compile(struct net *net,
pp_ptr = optptr + 2; pp_ptr = optptr + 2;
goto error; goto error;
} }
opt->ts = optptr - iph;
if (rt) { if (rt) {
spec_dst_fill(&spec_dst, skb); spec_dst_fill(&spec_dst, skb);
memcpy(&optptr[optptr[2]-1], &spec_dst, 4); memcpy(&optptr[optptr[2]-1], &spec_dst, 4);
@ -396,7 +394,6 @@ int ip_options_compile(struct net *net,
pp_ptr = optptr + 2; pp_ptr = optptr + 2;
goto error; goto error;
} }
opt->ts = optptr - iph;
{ {
__be32 addr; __be32 addr;
memcpy(&addr, &optptr[optptr[2]-1], 4); memcpy(&addr, &optptr[optptr[2]-1], 4);
@ -429,12 +426,12 @@ int ip_options_compile(struct net *net,
pp_ptr = optptr + 3; pp_ptr = optptr + 3;
goto error; goto error;
} }
opt->ts = optptr - iph;
if (skb) { if (skb) {
optptr[3] = (optptr[3]&0xF)|((overflow+1)<<4); optptr[3] = (optptr[3]&0xF)|((overflow+1)<<4);
opt->is_changed = 1; opt->is_changed = 1;
} }
} }
opt->ts = optptr - iph;
break; break;
case IPOPT_RA: case IPOPT_RA:
if (optlen < 4) { if (optlen < 4) {