diff options
Diffstat (limited to 'net/ipv4/ip_options.c')
| -rw-r--r-- | net/ipv4/ip_options.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/net/ipv4/ip_options.c b/net/ipv4/ip_options.c index f6289bf6f332..ec7264514a82 100644 --- a/net/ipv4/ip_options.c +++ b/net/ipv4/ip_options.c | |||
| @@ -370,7 +370,6 @@ int ip_options_compile(struct net *net, | |||
| 370 | } | 370 | } |
| 371 | switch (optptr[3]&0xF) { | 371 | switch (optptr[3]&0xF) { |
| 372 | case IPOPT_TS_TSONLY: | 372 | case IPOPT_TS_TSONLY: |
| 373 | opt->ts = optptr - iph; | ||
| 374 | if (skb) | 373 | if (skb) |
| 375 | timeptr = &optptr[optptr[2]-1]; | 374 | timeptr = &optptr[optptr[2]-1]; |
| 376 | opt->ts_needtime = 1; | 375 | opt->ts_needtime = 1; |
| @@ -381,7 +380,6 @@ int ip_options_compile(struct net *net, | |||
| 381 | pp_ptr = optptr + 2; | 380 | pp_ptr = optptr + 2; |
| 382 | goto error; | 381 | goto error; |
| 383 | } | 382 | } |
| 384 | opt->ts = optptr - iph; | ||
| 385 | if (rt) { | 383 | if (rt) { |
| 386 | spec_dst_fill(&spec_dst, skb); | 384 | spec_dst_fill(&spec_dst, skb); |
| 387 | memcpy(&optptr[optptr[2]-1], &spec_dst, 4); | 385 | memcpy(&optptr[optptr[2]-1], &spec_dst, 4); |
| @@ -396,7 +394,6 @@ int ip_options_compile(struct net *net, | |||
| 396 | pp_ptr = optptr + 2; | 394 | pp_ptr = optptr + 2; |
| 397 | goto error; | 395 | goto error; |
| 398 | } | 396 | } |
| 399 | opt->ts = optptr - iph; | ||
| 400 | { | 397 | { |
| 401 | __be32 addr; | 398 | __be32 addr; |
| 402 | memcpy(&addr, &optptr[optptr[2]-1], 4); | 399 | memcpy(&addr, &optptr[optptr[2]-1], 4); |
| @@ -423,18 +420,18 @@ int ip_options_compile(struct net *net, | |||
| 423 | put_unaligned_be32(midtime, timeptr); | 420 | put_unaligned_be32(midtime, timeptr); |
| 424 | opt->is_changed = 1; | 421 | opt->is_changed = 1; |
| 425 | } | 422 | } |
| 426 | } else { | 423 | } else if ((optptr[3]&0xF) != IPOPT_TS_PRESPEC) { |
| 427 | unsigned int overflow = optptr[3]>>4; | 424 | unsigned int overflow = optptr[3]>>4; |
| 428 | if (overflow == 15) { | 425 | if (overflow == 15) { |
| 429 | pp_ptr = optptr + 3; | 426 | pp_ptr = optptr + 3; |
| 430 | goto error; | 427 | goto error; |
| 431 | } | 428 | } |
| 432 | opt->ts = optptr - iph; | ||
| 433 | if (skb) { | 429 | if (skb) { |
| 434 | optptr[3] = (optptr[3]&0xF)|((overflow+1)<<4); | 430 | optptr[3] = (optptr[3]&0xF)|((overflow+1)<<4); |
| 435 | opt->is_changed = 1; | 431 | opt->is_changed = 1; |
| 436 | } | 432 | } |
| 437 | } | 433 | } |
| 434 | opt->ts = optptr - iph; | ||
| 438 | break; | 435 | break; |
| 439 | case IPOPT_RA: | 436 | case IPOPT_RA: |
| 440 | if (optlen < 4) { | 437 | if (optlen < 4) { |