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

Commit 0a5ebb80 authored by David S. Miller's avatar David S. Miller
Browse files

ipv4: Pass explicit daddr arg to ip_send_reply(). 



This eliminates an access to rt->rt_src.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1c3319fb

include/net/ip.h

+2 −2
Original line number Diff line number Diff line
@@ -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;

net/ipv4/ip_output.c

+3 −4
Original line number Diff line number Diff line
@@ -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;

net/ipv4/tcp_ipv4.c

+2 −2
Original line number Diff line number Diff line
@@ -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);