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

Commit 1f9e636e authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller
Browse files

[TCP]: Use BUILD_BUG_ON for tcp_skb_cb size checking 



The sizeof(struct tcp_skb_cb) should not be less than the
sizeof(skb->cb). This is checked in net/ipv4/tcp.c, but
this check can be made more gracefully.

Signed-off-by: default avatarPavel Emelyanov <xemul@openvz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ea72912c

net/ipv4/tcp.c

+1 −4
Original line number Diff line number Diff line
@@ -2563,7 +2563,6 @@ void tcp_done(struct sock *sk) 
}

EXPORT_SYMBOL_GPL(tcp_done);



extern void __skb_cb_too_small_for_tcp(int, int);

extern struct tcp_congestion_ops tcp_reno;



static __initdata unsigned long thash_entries;
@@ -2582,9 +2581,7 @@ void __init tcp_init(void) 
	unsigned long limit;

	int order, i, max_share;



	if (sizeof(struct tcp_skb_cb) > sizeof(skb->cb))

		__skb_cb_too_small_for_tcp(sizeof(struct tcp_skb_cb),

					   sizeof(skb->cb));

	BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > sizeof(skb->cb));



	tcp_hashinfo.bind_bucket_cachep =

		kmem_cache_create("tcp_bind_bucket",