luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

inet: request sock should init IPv6/IPv4 addresses

Browse Source 
In order to be able to use sk_ehashfn() for request socks,
we need to initialize their IPv6/IPv4 addresses.

Signed-off-by: Eric Dumazet <edumazet@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Eric Dumazet 2015-03-18 14:05:38 -07:00 committed by David S. Miller
parent b4d6444ea3
commit 08d2cc3b26
5 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/net/request_sock.h
View File

@ -91,6 +91,11 @@ static inline struct request_sock *inet_reqsk(struct sock *sk)
return (struct request_sock *)sk; return (struct request_sock *)sk;
} }
static inline struct sock *req_to_sk(struct request_sock *req)
{
return (struct sock *)req;
}
static inline void reqsk_free(struct request_sock *req) static inline void reqsk_free(struct request_sock *req)
{ {
/* temporary debugging */ /* temporary debugging */

4
net/dccp/ipv4.c
View File

@ -638,8 +638,8 @@ int dccp_v4_conn_request(struct sock *sk, struct sk_buff *skb)
goto drop_and_free; goto drop_and_free;
ireq = inet_rsk(req); ireq = inet_rsk(req);
ireq->ir_loc_addr = ip_hdr(skb)->daddr; sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)->daddr);
ireq->ir_rmt_addr = ip_hdr(skb)->saddr; sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr);
ireq->ireq_family = AF_INET; ireq->ireq_family = AF_INET;
ireq->ir_iif = sk->sk_bound_dev_if; ireq->ir_iif = sk->sk_bound_dev_if;

4
net/ipv4/inet_diag.c
View File

@ -742,14 +742,14 @@ static int inet_diag_dump_reqs(struct sk_buff *skb, struct sock *sk,
if (bc) { if (bc) {
/* Note: entry.sport and entry.userlocks are already set */ /* Note: entry.sport and entry.userlocks are already set */
entry_fill_addrs(&entry, (struct sock *)req); entry_fill_addrs(&entry, req_to_sk(req));
entry.dport = ntohs(ireq->ir_rmt_port); entry.dport = ntohs(ireq->ir_rmt_port);
if (!inet_diag_bc_run(bc, &entry)) if (!inet_diag_bc_run(bc, &entry))
continue; continue;
} }
err = inet_req_diag_fill((struct sock *)req, skb, err = inet_req_diag_fill(req_to_sk(req), skb,
NETLINK_CB(cb->skb).portid, NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, cb->nlh->nlmsg_seq,
NLM_F_MULTI, cb->nlh); NLM_F_MULTI, cb->nlh);

4
net/ipv4/syncookies.c
View File

@ -337,8 +337,8 @@ struct sock *cookie_v4_check(struct sock *sk, struct sk_buff *skb)
req->mss = mss; req->mss = mss;
ireq->ir_num = ntohs(th->dest); ireq->ir_num = ntohs(th->dest);
ireq->ir_rmt_port = th->source; ireq->ir_rmt_port = th->source;
ireq->ir_loc_addr = ip_hdr(skb)->daddr; sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)->daddr);
ireq->ir_rmt_addr = ip_hdr(skb)->saddr; sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr);
ireq->ir_mark = inet_request_mark(sk, skb); ireq->ir_mark = inet_request_mark(sk, skb);
ireq->snd_wscale = tcp_opt.snd_wscale; ireq->snd_wscale = tcp_opt.snd_wscale;
ireq->sack_ok = tcp_opt.sack_ok; ireq->sack_ok = tcp_opt.sack_ok;

8
net/ipv4/tcp_ipv4.c
View File

@ -1219,14 +1219,14 @@ static bool tcp_v4_inbound_md5_hash(struct sock *sk, const struct sk_buff *skb)
#endif #endif
static void tcp_v4_init_req(struct request_sock *req, struct sock *sk, static void tcp_v4_init_req(struct request_sock *req, struct sock *sk_listener,
struct sk_buff *skb) struct sk_buff *skb)
{ {
struct inet_request_sock *ireq = inet_rsk(req); struct inet_request_sock *ireq = inet_rsk(req);
ireq->ir_loc_addr = ip_hdr(skb)->daddr; sk_rcv_saddr_set(req_to_sk(req), ip_hdr(skb)->daddr);
ireq->ir_rmt_addr = ip_hdr(skb)->saddr; sk_daddr_set(req_to_sk(req), ip_hdr(skb)->saddr);
ireq->no_srccheck = inet_sk(sk)->transparent; ireq->no_srccheck = inet_sk(sk_listener)->transparent;
ireq->opt = tcp_v4_save_options(skb); ireq->opt = tcp_v4_save_options(skb);
ireq->ireq_family = AF_INET; ireq->ireq_family = AF_INET;
} }