mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 02:39:48 +00:00
ipv4: Pass explicit daddr arg to ip_send_reply().
This eliminates an access to rt->rt_src. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
1c3319fb69
commit
0a5ebb8000
3 changed files with 7 additions and 8 deletions
|
@ -174,8 +174,8 @@ static inline __u8 ip_reply_arg_flowi_flags(const struct ip_reply_arg *arg)
|
|||
return (arg->flags & IP_REPLY_ARG_NOSRCCHECK) ? FLOWI_FLAG_ANYSRC : 0;
|
||||
}
|
||||
|
||||
void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
|
||||
unsigned int len);
|
||||
void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
|
||||
struct ip_reply_arg *arg, unsigned int len);
|
||||
|
||||
struct ipv4_config {
|
||||
int log_martians;
|
||||
|
|
|
@ -1459,20 +1459,19 @@ static int ip_reply_glue_bits(void *dptr, char *to, int offset,
|
|||
* Should run single threaded per socket because it uses the sock
|
||||
* structure to pass arguments.
|
||||
*/
|
||||
void ip_send_reply(struct sock *sk, struct sk_buff *skb, struct ip_reply_arg *arg,
|
||||
unsigned int len)
|
||||
void ip_send_reply(struct sock *sk, struct sk_buff *skb, __be32 daddr,
|
||||
struct ip_reply_arg *arg, unsigned int len)
|
||||
{
|
||||
struct inet_sock *inet = inet_sk(sk);
|
||||
struct ip_options_data replyopts;
|
||||
struct ipcm_cookie ipc;
|
||||
struct flowi4 fl4;
|
||||
__be32 daddr;
|
||||
struct rtable *rt = skb_rtable(skb);
|
||||
|
||||
if (ip_options_echo(&replyopts.opt.opt, skb))
|
||||
return;
|
||||
|
||||
daddr = ipc.addr = rt->rt_src;
|
||||
ipc.addr = daddr;
|
||||
ipc.opt = NULL;
|
||||
ipc.tx_flags = 0;
|
||||
|
||||
|
|
|
@ -651,7 +651,7 @@ static void tcp_v4_send_reset(struct sock *sk, struct sk_buff *skb)
|
|||
arg.flags = (sk && inet_sk(sk)->transparent) ? IP_REPLY_ARG_NOSRCCHECK : 0;
|
||||
|
||||
net = dev_net(skb_dst(skb)->dev);
|
||||
ip_send_reply(net->ipv4.tcp_sock, skb,
|
||||
ip_send_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
|
||||
&arg, arg.iov[0].iov_len);
|
||||
|
||||
TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
|
||||
|
@ -726,7 +726,7 @@ static void tcp_v4_send_ack(struct sk_buff *skb, u32 seq, u32 ack,
|
|||
if (oif)
|
||||
arg.bound_dev_if = oif;
|
||||
|
||||
ip_send_reply(net->ipv4.tcp_sock, skb,
|
||||
ip_send_reply(net->ipv4.tcp_sock, skb, ip_hdr(skb)->saddr,
|
||||
&arg, arg.iov[0].iov_len);
|
||||
|
||||
TCP_INC_STATS_BH(net, TCP_MIB_OUTSEGS);
|
||||
|
|
Loading…
Reference in a new issue