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

Merge branch 'sock-cookie-initializers' 



Willem de Bruijn says:

====================
sock cookie initializers

Recent UDP GSO and SO_TXTIME features added new fields to cookie
structs.

When adding a field, all sites where a struct is initialized have to
be updated, which is a lot of boilerplate. Alternatively, a field can
be initialized selectively, but this is fragile. I introduced a bug
in udp gso where an uninitialized field was read. See also fix commit
("9887cba1 ip: limit use of gso_size to udp").

Introduce initializers for structs ipcm(6)_cookie and sockc_cookie.

patch 1..3 do exactly this.
patch 4..5 make ipv4 and ipv6 handle cookies the same way and
           remove some boilerplate in doing so.
patch 6    removes the udp gso branch that needed the above fix
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ab8565af fbf47813

include/net/ip.h

+15 −1
Original line number Original line Diff line number Diff line
@@ -72,13 +72,27 @@ struct ipcm_cookie { 
	__be32			addr;

	__be32			addr;

	int			oif;

	int			oif;

	struct ip_options_rcu	*opt;

	struct ip_options_rcu	*opt;

	__u8			tx_flags;

	__u8			ttl;

	__u8			ttl;

	__s16			tos;

	__s16			tos;

	char			priority;

	char			priority;

	__u16			gso_size;

	__u16			gso_size;

};

};





static inline void ipcm_init(struct ipcm_cookie *ipcm)

{

	*ipcm = (struct ipcm_cookie) { .tos = -1 };

}



static inline void ipcm_init_sk(struct ipcm_cookie *ipcm,

				const struct inet_sock *inet)

{

	ipcm_init(ipcm);



	ipcm->sockc.tsflags = inet->sk.sk_tsflags;

	ipcm->oif = inet->sk.sk_bound_dev_if;

	ipcm->addr = inet->inet_saddr;

}



#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))

#define IPCB(skb) ((struct inet_skb_parm*)((skb)->cb))

#define PKTINFO_SKB_CB(skb) ((struct in_pktinfo *)((skb)->cb))

#define PKTINFO_SKB_CB(skb) ((struct in_pktinfo *)((skb)->cb))

include/net/ipv6.h

+22 −4
Original line number Original line Diff line number Diff line
@@ -294,6 +294,7 @@ struct ipv6_fl_socklist { 
};

};





struct ipcm6_cookie {

struct ipcm6_cookie {

	struct sockcm_cookie sockc;

	__s16 hlimit;

	__s16 hlimit;

	__s16 tclass;

	__s16 tclass;

	__s8  dontfrag;

	__s8  dontfrag;
@@ -301,6 +302,25 @@ struct ipcm6_cookie { 
	__u16 gso_size;

	__u16 gso_size;

};

};





static inline void ipcm6_init(struct ipcm6_cookie *ipc6)

{

	*ipc6 = (struct ipcm6_cookie) {

		.hlimit = -1,

		.tclass = -1,

		.dontfrag = -1,

	};

}



static inline void ipcm6_init_sk(struct ipcm6_cookie *ipc6,

				 const struct ipv6_pinfo *np)

{

	*ipc6 = (struct ipcm6_cookie) {

		.hlimit = -1,

		.tclass = np->tclass,

		.dontfrag = np->dontfrag,

	};

}



static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)

static inline struct ipv6_txoptions *txopt_get(const struct ipv6_pinfo *np)

{

{

	struct ipv6_txoptions *opt;

	struct ipv6_txoptions *opt;
@@ -940,8 +960,7 @@ int ip6_append_data(struct sock *sk, 
				int odd, struct sk_buff *skb),

				int odd, struct sk_buff *skb),

		    void *from, int length, int transhdrlen,

		    void *from, int length, int transhdrlen,

		    struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

		    struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

		    struct rt6_info *rt, unsigned int flags,

		    struct rt6_info *rt, unsigned int flags);

		    const struct sockcm_cookie *sockc);





int ip6_push_pending_frames(struct sock *sk);

int ip6_push_pending_frames(struct sock *sk);
@@ -958,8 +977,7 @@ struct sk_buff *ip6_make_skb(struct sock *sk, 
			     void *from, int length, int transhdrlen,

			     void *from, int length, int transhdrlen,

			     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

			     struct ipcm6_cookie *ipc6, struct flowi6 *fl6,

			     struct rt6_info *rt, unsigned int flags,

			     struct rt6_info *rt, unsigned int flags,

			     struct inet_cork_full *cork,

			     struct inet_cork_full *cork);

			     const struct sockcm_cookie *sockc);





static inline struct sk_buff *ip6_finish_skb(struct sock *sk)

static inline struct sk_buff *ip6_finish_skb(struct sock *sk)

{

{

include/net/sock.h

+6 −0
Original line number Original line Diff line number Diff line
@@ -1600,6 +1600,12 @@ struct sockcm_cookie { 
	u16 tsflags;

	u16 tsflags;

};

};





static inline void sockcm_init(struct sockcm_cookie *sockc,

			       const struct sock *sk)

{

	*sockc = (struct sockcm_cookie) { .tsflags = sk->sk_tsflags };

}



int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,

int __sock_cmsg_send(struct sock *sk, struct msghdr *msg, struct cmsghdr *cmsg,

		     struct sockcm_cookie *sockc);

		     struct sockcm_cookie *sockc);

int sock_cmsg_send(struct sock *sk, struct msghdr *msg,

int sock_cmsg_send(struct sock *sk, struct msghdr *msg,

include/net/transp_v6.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -42,8 +42,7 @@ void ip6_datagram_recv_specific_ctl(struct sock *sk, struct msghdr *msg, 
				    struct sk_buff *skb);

				    struct sk_buff *skb);





int ip6_datagram_send_ctl(struct net *net, struct sock *sk, struct msghdr *msg,

int ip6_datagram_send_ctl(struct net *net, struct sock *sk, struct msghdr *msg,

			  struct flowi6 *fl6, struct ipcm6_cookie *ipc6,

			  struct flowi6 *fl6, struct ipcm6_cookie *ipc6);

			  struct sockcm_cookie *sockc);





void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,

void __ip6_dgram_sock_seq_show(struct seq_file *seq, struct sock *sp,

			       __u16 srcp, __u16 destp, int rqueue, int bucket);

			       __u16 srcp, __u16 destp, int rqueue, int bucket);

net/ipv4/icmp.c

+2 −9
Original line number Original line Diff line number Diff line
@@ -429,15 +429,11 @@ static void icmp_reply(struct icmp_bxm *icmp_param, struct sk_buff *skb) 




	icmp_param->data.icmph.checksum = 0;

	icmp_param->data.icmph.checksum = 0;





	ipcm_init(&ipc);

	inet->tos = ip_hdr(skb)->tos;

	inet->tos = ip_hdr(skb)->tos;

	sk->sk_mark = mark;

	sk->sk_mark = mark;

	daddr = ipc.addr = ip_hdr(skb)->saddr;

	daddr = ipc.addr = ip_hdr(skb)->saddr;

	saddr = fib_compute_spec_dst(skb);

	saddr = fib_compute_spec_dst(skb);

	ipc.opt = NULL;

	ipc.tx_flags = 0;

	ipc.ttl = 0;

	ipc.tos = -1;

	ipc.sockc.transmit_time = 0;





	if (icmp_param->replyopts.opt.opt.optlen) {

	if (icmp_param->replyopts.opt.opt.optlen) {

		ipc.opt = &icmp_param->replyopts.opt;

		ipc.opt = &icmp_param->replyopts.opt;
@@ -711,12 +707,9 @@ void icmp_send(struct sk_buff *skb_in, int type, int code, __be32 info) 
	icmp_param.offset = skb_network_offset(skb_in);

	icmp_param.offset = skb_network_offset(skb_in);

	inet_sk(sk)->tos = tos;

	inet_sk(sk)->tos = tos;

	sk->sk_mark = mark;

	sk->sk_mark = mark;

	ipcm_init(&ipc);

	ipc.addr = iph->saddr;

	ipc.addr = iph->saddr;

	ipc.opt = &icmp_param.replyopts.opt;

	ipc.opt = &icmp_param.replyopts.opt;

	ipc.tx_flags = 0;

	ipc.ttl = 0;

	ipc.tos = -1;

	ipc.sockc.transmit_time = 0;





	rt = icmp_route_lookup(net, &fl4, skb_in, iph, saddr, tos, mark,

	rt = icmp_route_lookup(net, &fl4, skb_in, iph, saddr, tos, mark,

			       type, code, &icmp_param);

			       type, code, &icmp_param);

CRA Git | Maintained and supported by SUSTech CRA and CCSE