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

[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

net/ipv4/af_inet.c

+1 −4
Original line number Diff line number Diff line
@@ -1254,10 +1254,7 @@ static int __init inet_init(void) 
	struct list_head *r;

	int rc = -EINVAL;



	if (sizeof(struct inet_skb_parm) > sizeof(dummy_skb->cb)) {

		printk(KERN_CRIT "%s: panic\n", __FUNCTION__);

		goto out;

	}

	BUILD_BUG_ON(sizeof(struct inet_skb_parm) > sizeof(dummy_skb->cb));



	rc = proto_register(&tcp_prot, 1);

	if (rc)

net/ipv6/af_inet6.c

+2 −5
Original line number Diff line number Diff line
@@ -761,6 +761,8 @@ static int __init inet6_init(void) 
        struct list_head *r;

	int err;



	BUILD_BUG_ON(sizeof(struct inet6_skb_parm) > sizeof(dummy_skb->cb));



#ifdef MODULE

#if 0 /* FIXME --RR */

	if (!mod_member_present(&__this_module, can_unload))
@@ -770,11 +772,6 @@ static int __init inet6_init(void) 
#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);

	if (err)

		goto out;

net/netlink/af_netlink.c

+1 −4
Original line number Diff line number Diff line
@@ -1762,8 +1762,6 @@ static struct net_proto_family netlink_family_ops = { 
	.owner	= THIS_MODULE,	/* for consistency 8) */

};



extern void netlink_skb_parms_too_large(void);



static int __init netlink_proto_init(void)

{

	struct sk_buff *dummy_skb;
@@ -1775,8 +1773,7 @@ static int __init netlink_proto_init(void) 
	if (err != 0)

		goto out;



	if (sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb))

		netlink_skb_parms_too_large();

	BUILD_BUG_ON(sizeof(struct netlink_skb_parms) > sizeof(dummy_skb->cb));



	nl_table = kcalloc(MAX_LINKS, sizeof(*nl_table), GFP_KERNEL);

	if (!nl_table)

net/unix/af_unix.c

+1 −4
Original line number Diff line number Diff line
@@ -2060,10 +2060,7 @@ static int __init af_unix_init(void) 
	int rc = -1;

	struct sk_buff *dummy_skb;



	if (sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb)) {

		printk(KERN_CRIT "%s: panic\n", __FUNCTION__);

		goto out;

	}

	BUILD_BUG_ON(sizeof(struct unix_skb_parms) > sizeof(dummy_skb->cb));



	rc = proto_register(&unix_proto, 1);

        if (rc != 0) {