Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 461b74c3 authored by Cong Wang's avatar Cong Wang Committed by David S. Miller
Browse files

ipv4: clean up cookie_v4_check() 



We can retrieve opt from skb, no need to pass it as a parameter.
And opt should always be non-NULL, no need to check.

Cc: Krzysztof Kolasa <kkolasa@winsoft.pl>
Cc: Eric Dumazet <edumazet@google.com>
Tested-by: default avatarKrzysztof Kolasa <kkolasa@winsoft.pl>
Signed-off-by: default avatarCong Wang <cwang@twopensource.com>
Signed-off-by: default avatarCong Wang <xiyou.wangcong@gmail.com>
Acked-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e25f866f

include/net/tcp.h

+2 −3
Original line number Diff line number Diff line
@@ -468,8 +468,7 @@ void inet_sk_rx_dst_set(struct sock *sk, const struct sk_buff *skb); 
/* From syncookies.c */

int __cookie_v4_check(const struct iphdr *iph, const struct tcphdr *th,

		      u32 cookie);

struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,

			     struct ip_options *opt);

struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb);

#ifdef CONFIG_SYN_COOKIES



/* Syncookies use a monotonic timer which increments every 60 seconds.
@@ -1674,7 +1673,7 @@ static inline struct ip_options_rcu *tcp_v4_save_options(struct sk_buff *skb) 
	const struct ip_options *opt = &TCP_SKB_CB(skb)->header.h4.opt;

	struct ip_options_rcu *dopt = NULL;



	if (opt && opt->optlen) {

	if (opt->optlen) {

		int opt_size = sizeof(*dopt) + opt->optlen;



		dopt = kmalloc(opt_size, GFP_ATOMIC);

net/ipv4/syncookies.c

+3 −3
Original line number Diff line number Diff line
@@ -255,9 +255,9 @@ bool cookie_check_timestamp(struct tcp_options_received *tcp_opt, 
}

EXPORT_SYMBOL(cookie_check_timestamp);



struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb,

			     struct ip_options *opt)

struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)

{

	struct ip_options *opt = &TCP_SKB_CB(skb)->header.h4.opt;

	struct tcp_options_received tcp_opt;

	struct inet_request_sock *ireq;

	struct tcp_request_sock *treq;
@@ -336,7 +336,7 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb, 
	flowi4_init_output(&fl4, sk->sk_bound_dev_if, ireq->ir_mark,

			   RT_CONN_FLAGS(sk), RT_SCOPE_UNIVERSE, IPPROTO_TCP,

			   inet_sk_flowi_flags(sk),

			   (opt && opt->srr) ? opt->faddr : ireq->ir_rmt_addr,

			   opt->srr ? opt->faddr : ireq->ir_rmt_addr,

			   ireq->ir_loc_addr, th->source, th->dest);

	security_req_classify_flow(req, flowi4_to_flowi(&fl4));

	rt = ip_route_output_key(sock_net(sk), &fl4);

net/ipv4/tcp_ipv4.c

+1 −1
Original line number Diff line number Diff line
@@ -1408,7 +1408,7 @@ static struct sock *tcp_v4_hnd_req(struct sock *sk, struct sk_buff *skb) 


#ifdef CONFIG_SYN_COOKIES

	if (!th->syn)

		sk = cookie_v4_check(sk, skb, &TCP_SKB_CB(skb)->header.h4.opt);

		sk = cookie_v4_check(sk, skb);

#endif

	return sk;

}