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

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

[TCP]: Restore SKB socket owner setting in tcp_transmit_skb(). 



Revert 93173112

We can't elide the skb_set_owner_w() here because things like certain
netfilter targets (such as owner MATCH) need a socket to be set on the
SKB for correct operation.

Thanks to Jan Engelhardt and other netfilter list members for
pointing this out.

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

include/net/inet6_connection_sock.h

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ extern void inet6_csk_reqsk_queue_hash_add(struct sock *sk, 


extern void inet6_csk_addr2sockaddr(struct sock *sk, struct sockaddr *uaddr);



extern int inet6_csk_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok);

extern int inet6_csk_xmit(struct sk_buff *skb, int ipfragok);

#endif /* _INET6_CONNECTION_SOCK_H */

include/net/inet_connection_sock.h

+1 −2
Original line number Diff line number Diff line
@@ -37,8 +37,7 @@ struct tcp_congestion_ops; 
 * (i.e. things that depend on the address family)

 */

struct inet_connection_sock_af_ops {

	int	    (*queue_xmit)(struct sk_buff *skb, struct sock *sk,

				  int ipfragok);

	int	    (*queue_xmit)(struct sk_buff *skb, int ipfragok);

	void	    (*send_check)(struct sock *sk, int len,

				  struct sk_buff *skb);

	int	    (*rebuild_header)(struct sock *sk);

include/net/ip.h

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ extern int ip_mc_output(struct sk_buff *skb); 
extern int		ip_fragment(struct sk_buff *skb, int (*output)(struct sk_buff *));

extern int		ip_do_nat(struct sk_buff *skb);

extern void		ip_send_check(struct iphdr *ip);

extern int		ip_queue_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok);

extern int		ip_queue_xmit(struct sk_buff *skb, int ipfragok);

extern void		ip_init(void);

extern int		ip_append_data(struct sock *sk,

				       int getfrag(void *from, char *to, int offset, int len,

net/dccp/output.c

+2 −2
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int dccp_transmit_skb(struct sock *sk, struct sk_buff *skb) 
		DCCP_INC_STATS(DCCP_MIB_OUTSEGS);



		memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));

		err = icsk->icsk_af_ops->queue_xmit(skb, sk, 0);

		err = icsk->icsk_af_ops->queue_xmit(skb, 0);

		return net_xmit_eval(err);

	}

	return -ENOBUFS;
@@ -396,7 +396,7 @@ int dccp_send_reset(struct sock *sk, enum dccp_reset_codes code) 
						      code);

		if (skb != NULL) {

			memset(&(IPCB(skb)->opt), 0, sizeof(IPCB(skb)->opt));

			err = inet_csk(sk)->icsk_af_ops->queue_xmit(skb, sk, 0);

			err = inet_csk(sk)->icsk_af_ops->queue_xmit(skb, 0);

			return net_xmit_eval(err);

		}

	}

net/ipv4/ip_output.c

+2 −1
Original line number Diff line number Diff line
@@ -281,8 +281,9 @@ int ip_output(struct sk_buff *skb) 
			    !(IPCB(skb)->flags & IPSKB_REROUTED));

}



int ip_queue_xmit(struct sk_buff *skb, struct sock *sk, int ipfragok)

int ip_queue_xmit(struct sk_buff *skb, int ipfragok)

{

	struct sock *sk = skb->sk;

	struct inet_sock *inet = inet_sk(sk);

	struct ip_options *opt = inet->opt;

	struct rtable *rt;