Skip to content

Commit

Permalink
tcp: Use defaults when no route options are available
Browse files Browse the repository at this point in the history
Trying to parse the option of a SYN packet that we have
no route entry for should just use global wide defaults
for route entry options.

Signed-off-by: Gilad Ben-Yossef <gilad@codefidence.com>
Tested-by: Valdis.Kletnieks@vt.edu
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Gilad Ben-Yossef authored and David S. Miller committed Nov 5, 2009
1 parent 05eaade commit 6a2a2d6
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 3 deletions.
2 changes: 1 addition & 1 deletion include/net/dst.h
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ dst_metric(const struct dst_entry *dst, int metric)
static inline u32
dst_feature(const struct dst_entry *dst, u32 feature)
{
return dst_metric(dst, RTAX_FEATURES) & feature;
return (dst ? dst_metric(dst, RTAX_FEATURES) & feature : 0);
}

static inline u32 dst_mtu(const struct dst_entry *dst)
Expand Down
2 changes: 0 additions & 2 deletions net/ipv4/tcp_input.c
Original file line number Diff line number Diff line change
Expand Up @@ -3704,8 +3704,6 @@ void tcp_parse_options(struct sk_buff *skb, struct tcp_options_received *opt_rx,
struct tcphdr *th = tcp_hdr(skb);
int length = (th->doff * 4) - sizeof(struct tcphdr);

BUG_ON(!estab && !dst);

ptr = (unsigned char *)(th + 1);
opt_rx->saw_tstamp = 0;

Expand Down

0 comments on commit 6a2a2d6

Please sign in to comment.