* [PATCH] Use BUILD_BUG_ON for tcp_skb_cb size checking
@ 2007-12-07 17:42 Pavel Emelyanov
2007-12-11 10:12 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Pavel Emelyanov @ 2007-12-07 17:42 UTC (permalink / raw)
To: David Miller; +Cc: Linux Netdev List, devel
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: Pavel Emelyanov <xemul@openvz.org>
---
diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c
index 8e65182..c8bebd3 100644
--- a/net/ipv4/tcp.c
+++ b/net/ipv4/tcp.c
@@ -2411,7 +2411,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;
@@ -2430,9 +2429,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",
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Use BUILD_BUG_ON for tcp_skb_cb size checking
2007-12-07 17:42 [PATCH] Use BUILD_BUG_ON for tcp_skb_cb size checking Pavel Emelyanov
@ 2007-12-11 10:12 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2007-12-11 10:12 UTC (permalink / raw)
To: xemul; +Cc: netdev, devel
From: Pavel Emelyanov <xemul@openvz.org>
Date: Fri, 07 Dec 2007 20:42:04 +0300
> 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: Pavel Emelyanov <xemul@openvz.org>
Applied to net-2.6.25, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-12-11 10:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-12-07 17:42 [PATCH] Use BUILD_BUG_ON for tcp_skb_cb size checking Pavel Emelyanov
2007-12-11 10:12 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).