Commit ef047f5e authored by YOSHIFUJI Hideaki's avatar YOSHIFUJI Hideaki Committed by David S. Miller

[NET]: Use BUILD_BUG_ON() for checking size of skb->cb.

Signed-off-by: default avatarYOSHIFUJI Hideaki <yoshfuji@linux-ipv6.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 366e4adc
...@@ -1254,10 +1254,7 @@ static int __init inet_init(void) ...@@ -1254,10 +1254,7 @@ static int __init inet_init(void)
struct list_head *r; struct list_head *r;
int rc = -EINVAL; int rc = -EINVAL;
if (sizeof(struct inet_skb_parm) > sizeof(dummy_skb->cb)) { BUILD_BUG_ON(sizeof(struct inet_skb_parm) > sizeof(dummy_skb->cb));
printk(KERN_CRIT "%s: panic\n", __FUNCTION__);
goto out;
}
rc = proto_register(&tcp_prot, 1); rc = proto_register(&tcp_prot, 1);
if (rc) if (rc)
......
...@@ -761,6 +761,8 @@ static int __init inet6_init(void) ...@@ -761,6 +761,8 @@ static int __init inet6_init(void)
struct list_head *r; struct list_head *r;
int err; int err;
BUILD_BUG_ON(sizeof(struct inet6_skb_parm) > sizeof(dummy_skb->cb));
#ifdef MODULE #ifdef MODULE
#if 0 /* FIXME --RR */ #if 0 /* FIXME --RR */
if (!mod_member_present(&__this_module, can_unload)) if (!mod_member_present(&__this_module, can_unload))
...@@ -770,11 +772,6 @@ static int __init inet6_init(void) ...@@ -770,11 +772,6 @@ static int __init inet6_init(void)
#endif #endif
#endif #endif
if (sizeof(struct inet6_skb_parm) > sizeof(dummy_skb->cb)) {
printk(KERN_CRIT "inet6_proto_init: size fault\n");
return -EINVAL;
}
err = proto_register(&tcpv6_prot, 1); err = proto_register(&tcpv6_prot, 1);
if (err) if (err)
goto out; goto out;
......
...@@ -1762,8 +1762,6 @@ static struct net_proto_family netlink_family_ops = { ...@@ -1762,8 +1762,6 @@ static struct net_proto_family netlink_family_ops = {
.owner = THIS_MODULE, /* for consistency 8) */ .owner = THIS_MODULE, /* for consistency 8) */
}; };
extern void netlink_skb_parms_too_large(void);
static int __init netlink_proto_init(void) static int __init netlink_proto_init(void)
{ {
struct sk_buff *dummy_skb; struct sk_buff *dummy_skb;
...@@ -1775,8 +1773,7 @@ static int __init netlink_proto_init(void) ...@@ -1775,8 +1773,7 @@ static int __init netlink_proto_init(void)
if (err != 0) if (err != 0)
goto out; goto out;
if (sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb)) BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb));
netlink_skb_parms_too_large();
nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL); nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL);
if (!nl_table) if (!nl_table)
......
...@@ -2060,10 +2060,7 @@ static int __init af_unix_init(void) ...@@ -2060,10 +2060,7 @@ static int __init af_unix_init(void)
int rc = -1; int rc = -1;
struct sk_buff *dummy_skb; struct sk_buff *dummy_skb;
if (sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb)) { BUILD_BUG_ON(sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb));
printk(KERN_CRIT "%s: panic\n", __FUNCTION__);
goto out;
}
rc = proto_register(&unix_proto, 1); rc = proto_register(&unix_proto, 1);
if (rc != 0) { if (rc != 0) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment