net: use common macro for assering skb->cb[] available size in protocol families

As part of an effort to move skb->dropcount to skb->cb[] use a common
macro in protocol families using skb->cb[] for ancillary data to
validate available room in skb->cb[].

Signed-off-by: Eyal Birger <eyal.birger@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

2 files changed, 4 insertions, 4 deletions

diff --git a/net/can/bcm.c b/net/can/bcm.c
index ee9ffd956552..d559f922326d 100644
--- a/net/can/bcm.c
+++ b/net/can/bcm.c
@@ -328,7 +328,7 @@ static void bcm_send_to_user(struct bcm_op *op, struct bcm_msg_head *head,
          *  containing the interface index.
          */
 
-        BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct sockaddr_can));
+        sock_skb_cb_check_size(sizeof(struct sockaddr_can));
         addr = (struct sockaddr_can *)skb->cb;
         memset(addr, 0, sizeof(*addr));
         addr->can_family  = AF_CAN;
diff --git a/net/can/raw.c b/net/can/raw.c
index 00c13ef23661..94601b7ff0a3 100644
--- a/net/can/raw.c
+++ b/net/can/raw.c
@@ -95,8 +95,8 @@ struct raw_sock {
  */
 static inline unsigned int *raw_flags(struct sk_buff *skb)
 {
-        BUILD_BUG_ON(sizeof(skb->cb) <= (sizeof(struct sockaddr_can) +
-                                         sizeof(unsigned int)));
+        sock_skb_cb_check_size(sizeof(struct sockaddr_can) +
+                               sizeof(unsigned int));
 
         /* return pointer after struct sockaddr_can */
         return (unsigned int *)(&((struct sockaddr_can *)skb->cb)[1]);
@@ -135,7 +135,7 @@ static void raw_rcv(struct sk_buff *oskb, void *data)
          *  containing the interface index.
          */
 
-        BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct sockaddr_can));
+        sock_skb_cb_check_size(sizeof(struct sockaddr_can));
         addr = (struct sockaddr_can *)skb->cb;
         memset(addr, 0, sizeof(*addr));
         addr->can_family  = AF_CAN;